into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/pgman.cpp:
  Auto merged
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/common/transporter/Packer.cpp:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.hpp:
  Auto merged
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  SCCS merged

- correction, missing node id

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/handler.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/Ndb.cpp:
  Merge

- implement read ahead during disk data scan


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  maximum read ahead
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  maximum read ahead should not be larger than page buffer size
  maximum aslo set to 32 pages
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  read ahead for disk data scan
storage/ndb/src/kernel/blocks/pgman.cpp:
  set higher max_io_waits for read ahead
  round off upwards in page_buffer size
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  add null callback to be used for read ahead (no callback needed)
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  remove the debug trace, not needed any more
storage/ndb/test/tools/hugoFill.cpp:
  allow setting database in hugoFill

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged

Bug#26342 auto_increment_increment AND auto_increment_offset REALLY REALLY anger NDB cluster, implemented support for auto_increment_offset and auto_increment_increment for Ndb, post review fix

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb

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


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

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

correct related sourcecode after merge from 5.0


storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  correct something to ensure only related sourcecode are merged

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


storage/ndb/include/debugger/EventLogger.hpp:
  Auto merged
storage/ndb/src/mgmclient/Makefile.am:
  Auto merged

ndb/include/debugger/EventLogger.hpp:
  add definition for new printLogEvent() function in CommandInterpreter.cpp
ndb/src/mgmclient/CommandInterpreter.cpp:
  add a printLogEvent() function to print log event;
  filter "<PING>" by ndb_logevent_get_next() in event_thread_run();
  filter "<PING>" by ndb_logevent_get_next() in executeStartBackup();
  and make executeStartBackup() same in both 5.0 and 5.1
ndb/src/mgmclient/Makefile.am:
  add link to use ndb_logevent_get_next()
mysql-test/r/ndb_backup_print.result:
  testcase result for ndb_backup_print
  produced by mysql_test_run.pl
mysql-test/t/ndb_backup_print.test:
  add testcase for ndb_mgm -e "start backup", check outupt format

  new public file needs to get into distribution


storage/ndb/include/Makefile.am:
  new public file needs to get into distribution

mysql-test/r/ndb_restore.result:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
mysql-test/t/ndb_restore.test:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - add extra row with NULL value to test
storage/ndb/tools/restore/consumer_restore.cpp:
  Bug #29103 ndb_restore segfaults on NULL var[char|binary]
  - check that the attribute is not null

storage/ndb/include/mgmapi/mgmapi_error.h:
  New BitKeeper file ``storage/ndb/include/mgmapi/mgmapi_error.h''

- step 1 mgmtsrvr error codes


storage/ndb/src/mgmsrv/ndb_mgmd_error.h:
  New BitKeeper file ``storage/ndb/src/mgmsrv/ndb_mgmd_error.h''

storage/ndb/src/mgmclient/main.cpp:
  fix build issues only caught by pb (mgm client history related)

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  add knielsen as MAINTAINER of NDBAPI NdbRecord examples

Index: ndb-merge/storage/ndb/MAINTAINERS
===================================================================


storage/ndb/MAINTAINERS:
  Add MAINTAINERS file for NDB

Index: ndb-work/storage/ndb/tools/ndb_error_reporter
===================================================================


storage/ndb/tools/ndb_error_reporter:
  BUG#29074 preserve file timestamps in ndb_error_reporter

Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
since global dict cache rewrite. This test should probably be enabled then.

Index: ndb-work/mysql-test/t/ndb_basic.test
===================================================================


mysql-test/r/ndb_basic.result:
  Enable test for (Closed) bug 16445
mysql-test/t/ndb_basic.test:
  Enable test for (Closed) bug 16445

Index: ndb-work/storage/ndb/src/mgmclient/main.cpp
===================================================================


storage/ndb/src/mgmclient/main.cpp:
  BUG#29073 Store history for ndb_mgm

This is somewhat related to BUG#26675 (ndb_connectstring not reported
in show global variables)

Index: ndb-work/mysql-test/r/ndb_basic.result
===================================================================


mysql-test/r/ndb_basic.result:
  Add tests for ndb variables (related to BUG#26675)
mysql-test/t/ndb_basic.test:
  Add tests for ndb variables (related to BUG#26675)

Index: ndb-work/mysql-test/t/disabled.def
===================================================================


mysql-test/t/disabled.def:
  Disable mysql_upgrade test (Bug#28560)

correctly divide timeout by 1000 to convert to seconds for SocketClient

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================


storage/ndb/src/mgmapi/mgmapi.cpp:
  BUG#29063 mgmapi: connect timeout set incorrectly

Add test to testMgm for Connect timeout. add to autotest.

Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================


storage/ndb/test/ndbapi/testMgm.cpp:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
storage/ndb/test/run-test/daily-basic-tests.txt:
  BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

- add config param to have better behavior with large tables

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


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  merge

  Improve buddy high order allocation
  Make removeCommonArea O(1) instead of O(N)
  Add limit to left/right search


storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp:
  Add info to buddy module test about 
  1) loops being made in buddy
  2) how much was allocated
storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp:
  1) make removeCommonArea o(1) - as list is (after fix) double linked anyway
  2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea
  3) add max loops in search left/right
  4) add more debug info

storage/ndb/src/ndbapi/ndb_internal.hpp:
  New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''

storage/ndb/include/ndbapi/NdbOperation.hpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.
storage/ndb/src/ndbapi/NdbBlob.cpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.
storage/ndb/src/ndbapi/NdbOperation.cpp:
  add NdbOperation option m_noErrorPropagation.
  If AO_IgnoreError and it are set then operation error does not set error code on transaction.
  Private, and used by NdbBlob.cpp only.

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


mysql-test/ndb/ndb_config_2_node.ini:
  Auto merged
storage/ndb/include/ndb_global.h.in:
  Auto merged
storage/ndb/src/common/portlib/NdbTick.c:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/restore.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp:
  Auto merged
storage/ndb/src/kernel/vm/WatchDog.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged