- also remove printout for error 4009

- make tests wait until ndb connects properly


mysql-test/extra/rpl_tests/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_log.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_basic.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_blob.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/extra/rpl_tests/rpl_row_sp006.test:
  make tests wait until ndb connects properly
mysql-test/include/have_multi_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/have_ndb.inc:
  make tests wait until ndb connects properly
mysql-test/include/ndb_not_readonly.inc:
  make tests wait until ndb connects properly
mysql-test/t/rpl_commit_after_flush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_delete_no_where.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_auto_inc.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_bank.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_blob2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_circular_simplex.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_commit_afterflush.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_advance.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_basic.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_dd_partitions.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_ddl.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_delete_nowhere.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_db.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_do_table.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_extraCol.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_idempotent.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_innodb_trans.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_insert_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_load.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update2.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_multi_update3.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_myisam2ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_rep_ignore.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sp006.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_stm_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_sync.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndb_trig004.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_ndbapi_multi.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_relayrotate.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_001.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_UUID.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_2myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_3innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_basic_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_blob_myisam.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_charset.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_func003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_log_innodb.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp003.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_row_sp006_InnoDB.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_stm_log.test:
  make tests wait until ndb connects properly
mysql-test/t/rpl_truncate_7ndb.test:
  make tests wait until ndb connects properly
mysql-test/include/ndb_master-slave.inc:
  New BitKeeper file ``mysql-test/include/ndb_master-slave.inc''

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


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  code
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  test
storage/ndb/test/run-test/daily-basic-tests.txt:
  test

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


mysql-test/t/ndb_restore.test:
  Auto merged
mysql-test/r/ndb_restore.result:
  null merge

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

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

- do not print 701 dictionary busy error


sql/ha_ndbcluster.cc:
  save the ndb error such that it can be traced
sql/ha_ndbcluster.h:
  save the ndb error such that it can be traced
sql/ha_ndbcluster_binlog.cc:
  use the traced ndb error to determine if it is an error that should be printed

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


mysql-test/r/ndb_restore.result:
  null merge
mysql-test/t/ndb_restore.test:
  null merge

- correct test and result file

- handler binlog's must be shutdoem before logger.cleanup_base

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

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.0-ndb

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