sql/ha_ndbcluster.h:
  Extern opt_ndb_constrbuf array from mysqld
sql/set_var.cc:
  Add ndb_connectstring to sys variable

ndb/src/ndbapi/NdbScanFilter.cpp:
  translate NAND/NOR into AND/OR, since AND/OR operations are all correct
ndb/test/include/NDBT_Test.hpp:
  add a new method executeOneCtx() in class NDBT_TestSuite, declare it
ndb/test/ndbapi/Makefile.am:
  Add a new test case: testScanFIlter.cpp to test/ndbapi/,
  thus modify the Makefile.am related to it
ndb/test/src/NDBT_Test.cpp:
  add a new method in class NDBT_TestSuite in order to adapt to 
  some customized test cases, because the default NDBT's test talbes
  and flow are fixed, if just modify related existing methods, it will
  influence other test cases in test/ndbapi/
ndb/test/ndbapi/testScanFilter.cpp:
  It's a test case for ndbapi scan filter, test for AND/OR/NAND/NOR scan operations.

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715


ndb/src/mgmclient/CommandInterpreter.cpp:
  Adding 'version' variable assigns the right value to prevent from the version(0.0.0.0) status

ndb/src/mgmclient/CommandInterpreter.cpp:
  Adding the judgement for node type to distinguish the data nodes and non-data nodes.
  From the return value. Management client can't distinguish the really not connected
  status for data nodes and status of non-data nodes.
  We can get the connect status about non-data nodes from version, if the version is 0, 
  it means no connected status.

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

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


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/ndbapi/Ndb.cpp:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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  willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work

ndb/src/common/util/SocketClient.cpp:
  fix two problems recently introduced:
  - HPUX build problem
  - some connect errors not being detected properly

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


sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged

into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb

into  willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487

sql/ha_ndbcluster.cc:
  bug#25562 use byte-size max_data_length() when setting blob part size

ndb/src/common/transporter/Transporter.cpp:
  change so timeout is rounded up to nearest second

  
  aim is to:
  a) if set_connect_timeout called, timeout connect attempt (for retry on
  next call) after timeout period
  b) preserve existing blocking behaviour otherwise (for, e.g. mgmapi)
  
  Related to customer issue with long time deleting ndb_cluster_connection
  object. believe we're hanging on the connect(2) call until timeout (when
  we then realise we should exit the thread).


ndb/include/mgmapi/mgmapi.h:
  add ndb_mgm_set_connect_timeout
ndb/include/util/SocketClient.hpp:
  add timeout (seconds) for max time to wait for connection
ndb/src/common/transporter/Transporter.cpp:
  set limit on amount of time we'll wait for tcp connect
ndb/src/common/util/SocketClient.cpp:
  only try to connect for a maximum of timeout time
ndb/src/mgmapi/mgmapi.cpp:
  add ndb_mgm_set_connect_timeout

    Fix bug in event handling wrt early node shutdown


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fix bug in event handling wrt early node shutdown
ndb/src/ndbapi/ClusterMgr.cpp:
  Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/ClusterMgr.hpp:
  Fix reportNodeFailed if only connected wo/ having received any API_REGCONF
ndb/src/ndbapi/SignalSender.cpp:
  Fix memleak

- post review changes

- make sure keys are copied correctly when varchar has 2 length bytes
- test case


mysql-test/r/ndb_basic.result:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - test case
mysql-test/t/ndb_basic.test:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - test case
sql/ha_ndbcluster.cc:
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - make sure keys are copied correctly when varchar has 2 length bytes

into  recycle.(none):/src/mysql-5.0-maint


mysys/string.c:
  Auto merged

- Corrected compiler warnings and performance problems with new 
dynstr_append_os_quoted function.


mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Fix compiler warnings.
  - Used dynstr_append_mem where string length is known.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

and combined, they add a platform-specific warning.  The warnings 
are not the goal of the test, in any case.


mysql-test/t/ps.test:
  Quash platform-specific warnings.

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint

 - Additional patch removing check for mysql_errno on already closed
   mysql1


tests/mysql_client_test.c:
  No need to check mysql_errno of mysql1 which has already been closed.

into  mysql.com:/usr/home/ram/work/bug22533/my50-bug22533


mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb


ndb/src/common/util/ConfigValues.cpp:
  Auto merged

  fix cpu peak in big clusters during unpack of config


ndb/src/common/util/ConfigValues.cpp:
  use bin-search instead of hash (as keys collide too much)

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


mysql-test/r/ndb_types.result:
  Auto merged
mysql-test/t/ndb_types.test:
  Auto merged

mysql-test/r/ndb_types.result:
  update results
mysql-test/t/ndb_types.test:
  Sleep a bit longer, to ensure that timestamp changes between:
  set @now = now();
  and:
  insert into/update t1
  
  Test case failed (select timestamp>@now from t1 ==> 0, should be 1), and passed when run again.  This should(?) avoid that fluke.
  
  Clean up test file a bit while I'm here.

Makefile.am:
  Fix previous bad merge.  Re-enable the test-ps target.

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50


client/mysqlbinlog.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/41


sql/sql_show.cc:
  Auto merged
sql/sql_parse.cc:
  Manual merge

into  recycle.(none):/src/mysql-5.0-maint


client/mysql_upgrade.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/string.c:
  Auto merged

- Create space safe strings for system() calls in mysql_upgrade.exe


client/mysql_upgrade.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Make use of new dynstr_append_os_quoted function to produce a string safe for
  passing to the system() function.                                              
  - Refactor possible source of assertion.
include/my_sys.h:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Declare dynstr_append_os_quoted function.
mysys/string.c:
  Bug#22807 mysql_upgrade fails when called with a basedir-path containing spaces
  - Define dynstr_append_os_quoted function.  This function will concatenate any 
  number of strings, escapes any OS quote in the result then surround the whole  
  affair in another set of quotes which is finally appended to specified         
  DYNAMIC_STRING.