into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


storage/ndb/include/kernel/signaldata/TcKeyRef.hpp:
  Auto merged
storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge
storage/ndb/src/ndbapi/NdbOperationExec.cpp:
  Merge

bug#21072 Duplicate key error in NDB references wrong key: Return correct key for non-batching inserts

  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race, error insert causes 5s delay)


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  make local INCL_NODEREQ/CONF more robust (to remove testprg introduced race)
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  soem more printout

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


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged

    Fix bug in bug fix, causing random test-failure

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

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

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


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

  release subscriber


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  release subscriber

- move api failure handling into own method
- add START_ORD so that hb checking can start really early


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  - make sure qmgr is "fully" informed about connections so that it can handle hb correctly
  - dont allow API/mysqld node to reconnect if we have not started yet (sp 8)
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early
storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  - move api failure handling into own method
  - add START_ORD so that hb checking can start really early
  - Init datastructures in constructor
  - as CONNECT_REP may occur before start phases
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  - Init datastructures in constructor
  - as CONNECT_REP may occur before start phases
  - start hb handling directly on connect rep (instead of first hb)

into  mysql.com:/home/marty/MySQL/mysql-5.0-ndb

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb

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

  Add *correct* check when a LCP is restorable
  by looking at maxGciStarted from LCP_FRAG_REP
  (for all fragments)

  bug observed by running testSystemRestart -n SR_DD_1_LCP T1
  (causes "incorrect" behaviour in 51-ndb, and crash when using 2 LCP)


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  ndb - bug#32519
    Add *correct* check when a LCP is restorable
    by looking at maxGciStarted from LCP_FRAG_REP
    (for all fragments)

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

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


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

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb

  additional (not stricly necessary for this bug...)
  only send EXEC_SRCONF to node *in* SR

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

  Fix handling of multiple redo phases
  - set correct state
  - handle 4 phases, by moving START_FRAGCONF to end of phase instead of beginning...


storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  remove unused state ACTIVE_REMOVE_AFTER
  remove unused variable nextLcp
  remove unused methods (BUILD_INDX)
  add counter of outstanding GSN_EXEC_FRAGREQ
  remove c_redo_complete_fragments cause it fits badly with functional multi-redo-phases
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp:
  remove unused stuff
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  1) set correct state before starting next non-empty REDO phase
  2) move GSN_START_FRAGCONF to execFRAGCONF instead of when sending GSN_EXEC_FRAGREQ
     or fragments with 4 redo-phases would never be complete...
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

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


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

  add new testtool that does connect/disconnect in loop


storage/ndb/test/tools/Makefile.am:
  add new test tool
storage/ndb/test/tools/connect.cpp:
  New BitKeeper file ``storage/ndb/test/tools/connect.cpp''

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


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

  which dumps all subscribers


storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Add new dump 8011
    which dumps all subscribers

  Increase connection negotiation timeout
  Improve some weirdness


storage/ndb/src/common/transporter/Transporter.cpp:
  - Increase connection negotiation timeout
  - return false if trying to connect when already connected (should still be assert)
storage/ndb/src/common/transporter/TransporterRegistry.cpp:
  Use correct "is_connected" checks
    (although this is kind of bogus and should be cleaned-up)

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

  Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database


storage/ndb/test/ndbapi/testDict.cpp:
  Updated DropDDObjects in testDict to ignore the user tables created in the MySQL database

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


storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  fix lcp master take over bug


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add debug code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  fix master lcp bug
  add 2 new error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

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

- correction, do not insert GAP on first startup

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb

  Rename: mysql-test/r/ndb_auto_increment.result -> mysql-test/suite/ndb/r/ndb_auto_increment.result
ndb_auto_increment.test, ndb_auto_increment.result:
  Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases
ha_ndbcluster.cc:
  Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0
ndb_auto_increment.test:
  Rename: mysql-test/t/ndb_auto_increment.test -> mysql-test/suite/ndb/t/ndb_auto_increment.test


sql/ha_ndbcluster.cc:
  Bug #31956       auto increment bugs in MySQL Cluster: Merging from 5.0
mysql-test/suite/ndb/t/ndb_auto_increment.test:
  Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases
mysql-test/suite/ndb/r/ndb_auto_increment.result:
  Bug #31956       auto increment bugs in MySQL Cluster: Adapted test cases