indicate units in SocketOutputStream timeout

rename timeout in SocketOutputStream to reflect units (ms)

In 5.0 as well as is safe cleanup patch that will help with merging.

into  poseidon.mysql.com:/home/tomas/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration

bug#25821  Excessive partition pruning for multi-range index scan in NDB API: post-review fix, added default value

Fix for bug#25821  Excessive partition pruning for multi-range index scan in NDB API: don't set distribution key if multi_range

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  mysql.com:/home/gluh/MySQL/Merge/5.0-opt

added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.0/mysql-5.0-ndb

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter

Need to change directory before calling mysql-test-run.pl

into  chilla.local:/home/mydev/mysql-4.1-axmrg

Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt

  merge of the 5.0-opt tree

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt

into  rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  chilla.local:/home/mydev/mysql-4.1-axmrg

The bug could cause choosing a sub-optimal execution plan for 
a single-table query if a unique index with many null keys were 
defined for the table. 
It happened because the code of the check_quick_keys function 
made an assumption that any key may occur in an unique index 
only once. Yet this is not true for keys with nulls that may 
have multiple occurrences in the index.

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work