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


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

  1) make sure that check_multi_node_shutdown does not proceed (in stop case)
  2) Fix printout


ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure that check_multi_node_shutdown does not proceed (in stop case)

  add two new start options that will decrease likelyhood of bug#18612
  push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612


ndb/include/kernel/signaldata/CmRegSignalData.hpp:
  Expand CmRegReq with lots of stuff
ndb/include/mgmapi/ndb_logevent.h:
  Add Start report during sp1
ndb/src/common/debugger/EventLogger.cpp:
  Add Start report during sp1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  Init cntrref
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix small bugs related to partial initial start
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Remove timeouts as they are handled in QMGR nowadays
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
    that will lead to start problems (crashes...)
ndb/src/kernel/vm/Configuration.cpp:
  Add new flags
    --initial-start
    --nowait-nodes

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


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  merge
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  merge
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  merge

  fix testprogam if only 1 node group


ndb/test/ndbapi/testNodeRestart.cpp:
  fix testprogam if only 1 node group

  Fix compile error...when compiling debug


ndb/include/kernel/signaldata/FailRep.hpp:
  Fix compile error...when compiling debug

  add testprg for SR case aswell


ndb/test/ndbapi/testNodeRestart.cpp:
  Test also partitioned start during SR
ndb/test/run-test/daily-basic-tests.txt:
  Test also partitioned start during SR

  post weeked fixes :-)
  change impl. to use READ_NODESREQ to query state of other qmgr(partition)
    this as it has no (current) side effects, so that it's possible only to kill
    starting cluster (if one started and one starting)


ndb/include/kernel/signaldata/FailRep.hpp:
  Add paritioned FAIL_REP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/test/ndbapi/testNodeRestart.cpp:
  Require that only starting cluster dies

  add new testpgrom for bug#18612 to autotest


ndb/test/run-test/daily-basic-tests.txt:
  Add new testprogram to autotest

  this also impl. gcp safe multi node shutdown
  1) block gcp
  2) wait for ongoing gcp
  3) inform all stopping QMGR's (so that they don't start with error handler)
  4) wait for all QMGR's to reply
  5) broadcast failrep for stopping nodes
  6) (if !master died) unblock gcp

  


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/FailRep.hpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/StopReq.hpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/test/ndbapi/testNodeRestart.cpp:
  test program for bug#18612

ndb/include/kernel/signaldata/WaitGCP.hpp:
  Add supprt for block/unblocking GCP
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add supprt for block/unblocking GCP

  correct return value in check_cm_cmregreq


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Fix bug in bug#16447
ndb/test/src/NdbRestarts.cpp:
  Fix bug in test program

  For various reasone have a partitioned cluster been created
  This patch makes sure that when they connect
  1) it's detected
  2) shutdown is forced


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  New dump/error insert for simulating network failure
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  1) Activly detect paritioned cluster(s)
  2) add some documentation
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  1) Activly detect paritioned cluster(s)
  2) add some documentation

  Ndbapi can reorder recattr when doing sorted scan (for faster comparision)
    make sure handler maps correct recattr to correct mysql column


mysql-test/r/ndb_read_multi_range.result:
  bug#17729
mysql-test/t/ndb_read_multi_range.test:
  bug#17729
sql/ha_ndbcluster.cc:
  Make sure to map correct rec-attr against correct mysql column
    (ndbapi reorders when doing sorted scan)

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


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/src/NdbBackup.cpp:
  Auto merged
ndb/test/src/NdbRestarts.cpp:
  Auto merged

  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)


ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
  Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
    Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)

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


ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

  remove bug#18385 from autotest as it only works on 2 node clusters


ndb/test/run-test/daily-basic-tests.txt:
  remove bug#18385 as it only works on 2 node clusters

  minor fixes in test programs


ndb/src/kernel/blocks/ERROR_codes.txt:
  Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
  Fix test program

  post merge fixes


ndb/include/mgmapi/ndbd_exit_codes.h:
  post merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  post merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge
ndb/src/kernel/error/ndbd_exit_codes.c:
  post merge
ndb/tools/desc.cpp:
  post merge

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


mysql-test/lib/mtr_timer.pl:
  Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
  Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
ndb/test/run-test/Makefile.am:
  Auto merged
ndb/test/src/NdbRestarter.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge
ndb/src/ndbapi/Ndbif.cpp:
  merge
ndb/src/ndbapi/TransporterFacade.cpp:
  merge
ndb/test/ndbapi/testTimeout.cpp:
  merge
ndb/test/run-test/daily-basic-tests.txt:
  merge
ndb/tools/desc.cpp:
  merge

  fix obscure error lookup


ndb/src/kernel/vm/TransporterCallback.cpp:
  Fix error lookup

  Add per partition info (optionally to ndb_desc)


ndb/tools/desc.cpp:
  Add per partition info (optionally to ndb_desc)

  Update makefile for removed files


ndb/test/run-test/Makefile.am:
  Update makefile for removed files

  some more ndb-autotest updates (previously uncommitted...but in use)


ndb/test/run-test/ndb-autotest.sh:
  More autotest updates

  minor update to ndb-autotest.sh and config files


ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-dl145a.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-ndbmaster.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-shark.txt:
  Add SendBufferMemory to remove rare overruns
ndb/test/run-test/ndb-autotest.sh:
  Add support for conf per host

  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding


ndb/src/kernel/blocks/ERROR_codes.txt:
  New error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  remove dumping of LCP info during NF
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/test/ndbapi/testNodeRestart.cpp:
  Add testcase for bug18414
ndb/test/ndbapi/testTimeout.cpp:
  Fix error code checking
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for bug18414

  timeslice DUMP(7015)


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  doc...
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  timeslice DUMP(7015)

  Partial system restart, can not try to start with higher GCI that own
  even if knowing about a higher number


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  Add new dump for setting time between gcp
ndb/include/kernel/signaldata/StartPerm.hpp:
  Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
  Add new error insert
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix so that we don't try to restart to a too new GCI when doing a partial start
  Add new error code when this node later tries to join
ndb/test/include/NdbRestarter.hpp:
  Add new method for selecting random node
ndb/test/ndbapi/testSystemRestart.cpp:
  Add new testcase for bug#18385
ndb/test/run-test/daily-basic-tests.txt:
  Run test in daily-basic
ndb/test/src/NdbRestarter.cpp:
  Add new method for selecting random node

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

  remove debug prinout

  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
  Keep broadcast of TAKEOVER_TCCONF for online upgrade


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Add clever dump for showing active operations
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Remove useless and tricky state fiddleing in TC
    to syncronize NF_CompleteRep as code is already present in DIH aswell
    Keep broadcast of TAKEOVER_TCCONF for online upgrade

  Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
  When getting 4012, set NeedAbort and ReleaseOnClose


ndb/src/ndbapi/NdbConnection.cpp:
  Use variable for WAITFOR_RESPONSE_TIMEOUT
ndb/src/ndbapi/Ndbif.cpp:
  Use variable timeout for waitfor, 
    when receiving 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/TransporterFacade.cpp:
  Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/src/ndbapi/TransporterFacade.hpp:
  Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/test/ndbapi/testTimeout.cpp:
  Add testcase for 4012
ndb/test/run-test/daily-basic-tests.txt:
  Add testcase for 4012

  Activly abort transactions (that's affected) during NF
  This removes a lot of bugs that can occur otherwise is using
    high value for TransactionDeadLockTimout


ndb/include/kernel/signaldata/TcContinueB.hpp:
  New continueb for active transaction abort on nf
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Add bitmask of participating nodes to transaction record
  Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Active transaction baortion

  dont't allow node to join cluster until all nodes has completed failure handling


ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override.
  But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later)
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase for bug#16772
ndb/test/run-test/daily-basic-tests.txt:
  Run test in basic suite

to binlog too much.

When InnoDB has to rollback a transaction because the lock table has
filled up, it also needs to inform the upper layer that the transaction
was rolled back so that the cached transaction is not written to the
binary log.


sql/ha_innodb.cc:
  When InnoDB rolls back a transaction in HA_ERR_LOCK_TABLE_FULL, it
  needs to inform the upper layer to rollback the transaction also.

  8 repeated nr with table wo/ logging cause crash
  Dont create crashed replica for temporary tables


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  Dont create crashed replica for temporary tables
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Dont create crashed replica for temporary tables

mysql-test/lib/mtr_timer.pl:
  Fix bug where ^C would trigger cleanup handler in both parent and
  timeout child processes, causing duplicated messages and potential
  conflicts.