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


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

  Fix correct log event on db-node disconnect


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Fix typo

  1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)


storage/ndb/include/kernel/signaldata/BackupContinueB.hpp:
  Add new error insert
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error insert
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Add new error insert
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  1) get >= and > correct for lcp keep/skip
  2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  1) get >= and > correct for lcp keep/skip
  2) always run lcp snapshot impl. (previously only for dd tables)
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

  SR crash if table with disk with hidden primary key...


storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
  fix bug 24166

  Handle events "differently" so that dict doesnt get lock too often


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  Handle event separatly as they dont set block_state :-(
storage/ndb/src/kernel/vm/KeyTable2.hpp:
  Handle event separatly as they dont set block_state :-(

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


storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged

  This prevent any subsequent node restarts, but it's better than crashing an alive node


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Fix for bug#24752
  This prevent any subsequent node restarts, but it's better than crashing an alive node

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


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

  Skip rollback if only committedRead in transaction


ndb/src/ndbapi/NdbTransaction.cpp:
  Skip rollback if only committedRead in transaction

  fixes to testprogram to test new impl. in 5.1


storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  move tsman dumps
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add more support for connection handling using dumps
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  port testprogram to 5.1 to avoid "extra" safety net in LQH

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


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  fix merge error


storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  fix merge error

  add testcase for bug#24717
 + fix typo


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp:
  Add new error insert 9002
    which is 9000, but will auto enable when started
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Fix typo
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase for bug#24717
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#24717

  5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...


storage/ndb/include/kernel/GlobalSignalNumbers.h:
  Add general routing signal
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  Add general routing signal
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  send TCKEYREF routed if needed
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  add general routing 
  remove node started state
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  add general routing 
  remove node started state
  remove "avoid sending committed read to early" as it now should be handled correctly
storage/ndb/include/kernel/signaldata/RouteOrd.hpp:
  New BitKeeper file ``storage/ndb/include/kernel/signaldata/RouteOrd.hpp''

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


storage/ndb/src/common/util/NdbSqlUtil.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.cpp:
  merge
storage/ndb/src/kernel/vm/SimulatedBlock.hpp:
  merge
storage/ndb/src/ndbapi/ndberror.c:
  merge

  5.0 version
  Add some extra state to try to prevent sending committedread to node too early


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove extra virtual-indirection
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add retry mechanism to send TCKEYREF
    (as extra safety)
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Add extra state to prevent sending committed reads to node to early
    (before connection establishment)
ndb/src/kernel/vm/SimulatedBlock.cpp:
  remove extra virtual-indirection
ndb/src/kernel/vm/SimulatedBlock.hpp:
  remove extra virtual-indirection

  Fix typo that yeilded rare crash in ACC


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  fix typo, where elementptr was sent as elementheader
  yeilded very rare crashes as only 1 bit is checked
    and it's only checked under certatin rare circumstances

  Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP


storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Handle not started nodes correctly
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP

  fix so backup message is printed even in case of "ndb_mgm -e"


storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp:
  fix backup printer
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Fix so that backup message is printed even if "ndb_mgm -e"
storage/ndb/src/ndbapi/SignalSender.cpp:
  move method into TransporterFacade to enable API_TRACE
storage/ndb/src/ndbapi/TransporterFacade.cpp:
  move method into TransporterFacade to enable API_TRACE

  Resend if master dies during alloc node id


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error code
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add new error code
storage/ndb/src/mgmsrv/MgmtSrvr.cpp:
  Make sure to resend if master died
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  add testcase

  remove debug printouts


ndb/src/common/util/NdbSqlUtil.cpp:
  remove debug printouts

  Fix scan filter on bit types
  (note should probably be enabled in condition pushdown aswell)


ndb/src/common/util/NdbSqlUtil.cpp:
  Add support for comparing bit types
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Add new error code
ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  Add new error code
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Add correct handling of unsupported type
ndb/src/ndbapi/ndberror.c:
  Add new error code

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

m  ove mlock to much earlier in startphases
  not to affect heartbeats


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  move mlock to much earlier in startphases
    not to affect heartbeats

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged

  actually do run mlockall


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  actually do run mlockall

  1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
  


storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  Make sure not to read uninitialized data in unique index code
    harmless (atleast before dynattr)
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Dont update p_latest_trans_gci
    for dirty unique index lookup

  Make sure LCP scan record is correct initialized


storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
  Init ScanOp
storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  And set correct pointers...

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/ndbapi/testScan.cpp:
  merge

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
ndb/test/ndbapi/testScan.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge

  update error code list
  (for bug#24447)


ndb/src/kernel/blocks/ERROR_codes.txt:
  ndb -
    update error code list

  api disconnect just after SCAN_TABREQ


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) add error insert for faking DISCONNECT of API just after SCAN_TABREQ
  2) handle error :-)
ndb/test/ndbapi/testScan.cpp:
  Add etstcase for bug 24447
ndb/test/run-test/daily-basic-tests.txt:
  Add etstcase for bug 24447

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


storage/ndb/src/common/util/socket_io.cpp:
  Auto merged
storage/ndb/src/common/util/InputStream.cpp:
  merge

  Fix bug wrt to '\r' handling in latest commit to bug#24011


ndb/src/common/util/InputStream.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011
ndb/src/common/util/socket_io.cpp:
  Fix bug wrt to '\r' handling in latest commit to bug#24011

  Make sure index scan does not commitDelete


mysql-test/r/ndb_index_ordered.result:
  testcase
mysql-test/t/ndb_index_ordered.test:
  testcase
storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Make sure index scan does not commitDelete

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


storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/src/common/util/socket_io.cpp:
  merge

  


ndb/src/common/util/socket_io.cpp:
  Fix problem with cut sockmessages

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


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

  Still leakage, make sure all unlinked operations are put back so they will be release
  (on failing blob operations, when AO_IgnoreError)


ndb/src/ndbapi/NdbConnection.cpp:
  Still leakage, make sure all unlinked operations are put back so they will be release

  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes


storage/ndb/src/mgmsrv/Services.cpp:
  revert fix bug#21052 as it's wrong, and induces bus-error on node crashes