into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21699

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

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


storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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

sql/sql_table.cc:
  add something to get possible tablespace info from src table 
  in mysql_create_like_table() at sql/sql_table.cc

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/bug26898-5.1-new-ndb-bj

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

ndb/src/common/transporter/TCP_Transporter.cpp:
  Add SO_KEEPALIVE socket option

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

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


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged

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

storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  change MaxNoOfOpenFiles's default value to 0, that means no max openning files limitation 
  in ndbfs when user doesnot set explicitly the value in config.ini;
  Meanwhile, if user set a specific value of MaxNoOfOpenFile and hit the max limiation, he 
  deserves the result.
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  change default to 0
storage/ndb/src/mgmsrv/ParamInfo.cpp:
  change default to 0

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

storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  add a goto to avoid a repeated ndb_mgm_start_backup() call

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

BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message.


mysql-test/r/ndb_dd_basic.result:
  adding some test result for increasing test codes.
mysql-test/t/ndb_dd_basic.test:
  adding some test codes for nodatafile in tablespace.
storage/ndb/include/kernel/signaldata/Extent.hpp:
  Add NoDatafile error code when allocating extent.
storage/ndb/src/kernel/blocks/tsman.cpp:
  when there is no datafile in spacefile , it should return NoDatafile error code, rather than NoExtentAvailable.
storage/ndb/src/ndbapi/ndberror.c:
  add no datafile error code and corresponding error message for NoDatafile

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

this patch of bug25295 depends on the patches of bug25877 and bug25880


sql/ha_ndbcluster.cc:
  add check for storage media changes between old and new table when do 'alter table ...'

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