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


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:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge

  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

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/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/test/include/NdbRestarter.hpp:
  Auto merged
storage/ndb/test/src/NdbRestarter.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  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)

into  eel.(none):/home/jonas/src/51-work

storage/ndb/test/run-test/atrt-gather-result.sh:
  remove backup from results tars aswell
storage/ndb/test/run-test/autotest-run.sh:
  add permissions
storage/ndb/test/run-test/main.cpp:
  make it work also on dl145a

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


storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  merge

  backport fix from 5.1


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

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


storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged

  make lockpages=1 run a bit earlier in startup


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

  increase timeout on slow test


storage/ndb/test/run-test/daily-basic-tests.txt:
  increase timeout...cause test is slow

  Fix testcase so that it does not leak tables...causing subsequent errors


storage/ndb/test/ndbapi/testDict.cpp:
  Fix testcase so that it does not leak tables...

    Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result


storage/ndb/test/run-test/main.cpp:
  Fix bug when restarting cluster after failure
    (fs was not cleared)
  Fix cosmetic bug that made rsync be run several times when gathering result

  fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)


storage/ndb/test/src/HugoOperations.cpp:
  fix ao_ignore behavior change in hugo

into  eel.(none):/home/jonas/src/51-work

BitKeeper/deleted/.del-conf-daily-basic-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-basic-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndb08.txt
BitKeeper/deleted/.del-conf-daily-devel-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-devel-ndbmaster.txt
BitKeeper/deleted/.del-conf-daily-sql-ndb08.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndb08.txt
BitKeeper/deleted/.del-conf-daily-sql-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-daily-sql-ndbmaster.txt
BitKeeper/deleted/.del-conf-dl145a.txt:
  Delete: storage/ndb/test/run-test/conf-dl145a.txt
BitKeeper/deleted/.del-conf-ndbmaster.txt:
  Delete: storage/ndb/test/run-test/conf-ndbmaster.txt
BitKeeper/deleted/.del-conf-shark.txt:
  Delete: storage/ndb/test/run-test/conf-shark.txt
storage/ndb/src/cw/cpcd/Makefile.am:
  new atrt
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp:
  new atrt
storage/ndb/test/run-test/Makefile.am:
  new atrt
storage/ndb/test/run-test/atrt-gather-result.sh:
  new atrt
storage/ndb/test/run-test/atrt.hpp:
  new atrt
storage/ndb/test/run-test/main.cpp:
  new atrt
storage/ndb/test/tools/Makefile.am:
  new atrt
storage/ndb/test/run-test/autotest-boot.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-boot.sh''
storage/ndb/test/run-test/autotest-run.sh:
  New BitKeeper file ``storage/ndb/test/run-test/autotest-run.sh''
storage/ndb/test/run-test/conf-dl145a.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-dl145a.cnf''
storage/ndb/test/run-test/conf-ndbmaster.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-ndbmaster.cnf''
storage/ndb/test/run-test/conf-repl.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-repl.cnf''
storage/ndb/test/run-test/example-my.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/example-my.cnf''
storage/ndb/test/run-test/files.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/files.cpp''
storage/ndb/test/run-test/setup.cpp:
  New BitKeeper file ``storage/ndb/test/run-test/setup.cpp''
storage/ndb/test/run-test/test-tests.txt:
  New BitKeeper file ``storage/ndb/test/run-test/test-tests.txt''

  remove debug printouts


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove debug printouts
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  remove debug printouts

storage/ndb/test/src/HugoTransactions.cpp:
  restore some accidently removed hugo code
storage/ndb/test/src/UtilTransactions.cpp:
  one more abort option fix

Add abort option to lots of Hugo code, 
as it assumes it and default value has changed


storage/ndb/test/src/HugoTransactions.cpp:
  Add abort option to lots of Hugo code, 
  as it assumes it and default value has changed
storage/ndb/test/src/UtilTransactions.cpp:
  Add abort option to lots of Hugo code, 
  as it assumes it and default value has changed

  - improve error message if starting wo/ enough REDO
  - decrease likelyhood of trying to start too early


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Add new error code (that maybe should have been there a looong time)
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add new check (during SR) for that sufficient REDO is present
    before continuing SR
storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
  Add list of GCI's of nodes so that we can check for sufficient REDO during a SR
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Add check for REDO during SR
    so that
  1) cluster is not trying to start too soon
  2) a better error message (than internal error) is provided if not enough REDO is present
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Add new error code (that maybe should have been there a looong time)

new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
   if not SR will fail, with this message


storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Prevent node from starting _at all_ if it has performed more than 6 failed
    node restart.
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  test prg 25984
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

into  eel.(none):/home/jonas/src/51-work


storage/ndb/test/tools/listen.cpp:
  Auto merged

  fix failure during start


storage/ndb/test/tools/listen.cpp:
  fix failure during start

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

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

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb

into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb


sql/log_event.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/slave.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/src/mgmsrv/main.cpp:
  Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
  Auto merged

BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch.


storage/ndb/src/common/debugger/EventLogger.cpp:
  Change content of error message structure

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


sql/ha_ndbcluster.cc:
  Auto merged

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: moved back assignment

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb

fix time period calculation


sql/ha_ndbcluster_binlog.cc:
  fix time period of NDB_BINLOG_TIMER

add the jamEntry()


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  add missing jamEntry() after EXECUTE_DIRECT

Reworked a section of code that caused valgrind errors (and that partitioning was not happy about). 


storage/archive/ha_archive.cc:
  Put checks around the code

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1


mysql-test/r/ndb_read_multi_range.result:
  Auto merged
mysql-test/t/ndb_read_multi_range.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Merge

Bug #25522  Update with IN syntax Clustertable + Trigger leads to mysqld segfault: in start_stmt, only change query_state if starting a new transactions, in read_multi_range_next, change query state when end is reached

storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  return RNIL instead of ndbrequire if memory allocation fails