into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug26898-5.1-new-ndb-bj

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged

sql/ha_ndbcluster.cc:
  remove the assertion, when trans is NULL, return 0 directly since the transaction is 
  possibly released in ha_ndbcluster::external_lock(...) function

correct the bitmap_set_bit when a field is timestamp and described 
with default CURRENT_TIMESTAMP or on update CURRENT_TIMESTAMP,
then it will reduce a little time cost when the field doesnot need 
to write.


sql/sql_update.cc:
  here table->timestamp_field represent only the timestamp field related to CURRENT_TIMESTAMP,
  when the timestamp_field_type is 0 or 1, it need not to write the field data further.

this patch is an absolutely necessary supplement of the previous patch,
the previous patch doesnot cover isnull() and isnotnull() methods' effect.


ndb/src/ndbapi/NdbScanFilter.cpp:
  correct isnull() and isnotnull() when these two methods called in a NAND/NOR operation

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/mysql-5.0-ndb-bj-merge


ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/ndbapi/NdbScanFilter.cpp:
  Auto merged

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj

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


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged

  Make sure not to handle API_FAILREQ if it's already handled


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Make sure not to handle API_FAILREQ if it's already handled

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged

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


storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged

  Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group


storage/ndb/src/kernel/blocks/lgman.cpp:
  Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  merge to 5.1, adopt testprg to optimized node recovery


storage/ndb/include/kernel/signaldata/LqhKey.hpp:
  Add Restore as friend
storage/ndb/src/kernel/blocks/restore.cpp:
  Give proper error message on LQHKEYREF
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  post merge fix, adopt to optimized node recovery...

into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

  Handle random(not in order) LQHKEYREQ failures during node-restart


ndb/src/kernel/blocks/ERROR_codes.txt:
  Document new error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Handle random(not in order) LQHKEYREQ failures during node-restart
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Error codes for various oom problems
ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  move CLEAR_ERROR_INSERT_VALUE to constructor so that it's reasonable to use it for
  restart testing
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Add error insert for CopyFragRef
ndb/test/ndbapi/testNodeRestart.cpp:
  Testprg for bug#27003
ndb/test/run-test/daily-basic-tests.txt:
  add testprg

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/vm/Pool.hpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/consumer_restore.cpp:
  Auto merged

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj


sql/ha_ndbcluster.cc:
  Auto merged

correct the inconsistency between columns' storage type with table's storage_media & tablespace


sql/ha_ndbcluster.cc:
  move something to proper location, 
  then columns' storage type are consistent with table's storage_media & tablespace

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug25877-5.1-new-ndb-bj

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307

into  ymer.(none):/usr/local/mysql/mysql-5.0-ndb

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBlobs.cpp:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1

into  poseidon.mysql.com:/home/tomas/mysql-5.1


mysql-test/t/disabled.def:
  manual merge

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

When doing partial blob update with NdbBlob::writeData(), zero-padding
after the write was wrongly done, causing part of the old blob value
to be overwritten with zeros (or spaces for text field).

Fixed by only padding when needed (when writing at end of the blob).


ndb/src/ndbapi/NdbBlob.cpp:
  Do not pad rest of blob part after the write, unless it is a write at the
  end of the blob.
ndb/test/ndbapi/testBlobs.cpp:
  Add test case.

into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.1-build

into  production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-build

into  poseidon.mysql.com:/home/tomas/mysql-5.1

into  poseidon.mysql.com:/home/tomas/mysql-5.1


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

into  poseidon.mysql.com:/home/tomas/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

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

into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge

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


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

added error code for failing send signal and timeout waiting for node failure


ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  added error code for failing send signal and timeout waiting for node failure
ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

Bug #26997  	mysqld segfault when in single user mode


sql/ha_ndbcluster.cc:
  make sure error is always set even if no proper error code from ndb
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  add error code for failing send signal (typically single user mode)
storage/ndb/src/ndbapi/ndberror.c:
  added error code for failing send signal and timeout waiting for node failure

into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged
sql/item.cc:
  Auto merged