ndb/test/ndbapi/testBitfield.cpp:
  fix correct argv/argc handling in testBitfield

  forgott to add testcase for bug#26481


ndb/test/run-test/daily-basic-tests.txt:
  forgott to add testcase for bug#26481

  fix for killed node during initial node restart


ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  add flag for initial node restart, to keep track on when to concider it to be "done"
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Check cstartRecReq also when refusing GCP_SAVEREQ
ndb/test/ndbapi/testNodeRestart.cpp:
  add testcase

  master failure during master take over


ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Make sure to clear NF_XX_LCP if master fails during master take-over
ndb/test/include/NdbRestarter.hpp:
  Add support for querying next master and node group
    (for multi node failure testing)
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase
ndb/test/src/NdbRestarter.cpp:
  Add support for querying next master and node group
    (for multi node failure testing)

  backport fix from 5.1


ndb/src/mgmsrv/InitConfigFileParser.cpp:
  backport fix from 5.1

  make lockpages=1 run a bit earlier in startup


ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  change order

  fix cpu peak in big clusters during unpack of config


ndb/src/common/util/ConfigValues.cpp:
  use bin-search instead of hash (as keys collide too much)

  add support for doing mlockall before mallc instead of after
  (recommit in 5.0)


ndb/include/portlib/NdbMem.h:
  add support for doing mlockall before mallc instead of after
ndb/src/common/portlib/NdbMem.c:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.cpp:
  add support for doing mlockall before mallc instead of after
ndb/src/kernel/vm/Configuration.hpp:
  add support for doing mlockall before mallc instead of after
ndb/src/mgmsrv/ConfigInfo.cpp:
  add support for doing mlockall before mallc instead of after

  fix bug when master failure during nr
  (recommit against 5.0)


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  recommit against 5.0
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  recommit against 5.0
ndb/test/ndbapi/testNodeRestart.cpp:
  recommit against 5.0
ndb/test/run-test/daily-basic-tests.txt:
  recommit against 5.0

  on master node failure during qmgr-commitreq
    make sure to remove all committed failed nodes from failed/prepfailed arrays


ndb/include/kernel/signaldata/DumpStateOrd.hpp:
  new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
  new error code
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  extra error insert variable
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  make sure to remove all committed failed nodes from failed/prepfailed arrays
ndb/test/ndbapi/testNodeRestart.cpp:
  testcase
ndb/test/run-test/daily-basic-tests.txt:
  testcase

  incorrect handling of commit/ignore error in unique index code


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  1) handle potential ptr error
  2) remove incorrect commit-handling in uk code
ndb/src/ndbapi/NdbTransaction.cpp:
  1) force 4012
  2) handle AO_IgnoreError in uk code
ndb/src/ndbapi/Ndbif.cpp:
  force 4012
ndb/test/ndbapi/testIndex.cpp:
  test program for 25059
ndb/test/run-test/daily-basic-tests.txt:
  add testcase

  add testcase


ndb/test/ndbapi/testBasic.cpp:
  add testcase for bug#25090
ndb/test/run-test/daily-basic-tests.txt:
  add testcase for bug#25090

  make sure apicon timer is reset when setting CS_CONNECTED


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  make sure apicon timer is reset when setting CS_CONNECTED

  Fix correct log event on db-node disconnect


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

  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

  Skip rollback if only committedRead in transaction


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

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

  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

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

  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

  


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

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


ndb/include/kernel/ndb_limits.h:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
  SCCS merged

  Fix some too small buffers in backup
  


ndb/include/kernel/ndb_limits.h:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE
ndb/src/kernel/blocks/backup/Backup.cpp:
  Make sure to set maxInsert so that we actually can handle NO_OF_META_PAGES
ndb/src/kernel/blocks/backup/Backup.hpp:
  backport for 5.1
  add MAX_WORDS_META_FILE for computing Backup::NO_OF_PAGES_META_FILE

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


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

  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fixed a 4.1/5.0 vs. 5.1 name change in latest SR bug fix

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


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

  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken


ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Fix monster SR bug making SR with ordered indexes (or temporary tables) broken

  this changes lock taken during peek, to decrease likelyhood of transaction abort
  


sql/ha_ndbcluster.cc:
  use exclusive lock in peek, as peek is used just before insert/update

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


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