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


sql/log.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_class.h:
  merge

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


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_repl.cc:
  merge

  fix deadlock if master switches log file in parallell with "show master logs"
  


sql/log.cc:
  add raw_get_current_log which dont take log mutex
sql/sql_class.h:
  add raw_get_current_log which dont take log mutex
sql/sql_repl.cc:
  Fix lock order i.e first log_lock then index_lock

  Add order by in rpl_(ndb)_multi_update3 to make result deterministic


mysql-test/extra/rpl_tests/rpl_multi_update3.test:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic
mysql-test/r/rpl_multi_update3.result:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic
mysql-test/r/rpl_ndb_multi_update3.result:
  Add order by in rpl_(ndb)_multi_update3 to make result deterministic

  fix backup/lcp race


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  fix backup/lcp race

  Snapup testBackup XXXerror


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Snapup testBackup XXXerror
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Snapup testBackup XXXerror

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


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

  Improve error message when detecting corrupted REDO log


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Improve error message when detecting corrupted REDO log

  adopt to new error code 755 (invalid tablespace)


storage/ndb/test/src/NDBT_Tables.cpp:
  Fxi new error code

  disable ndb_autodiscover3 (cluster restart (--initial))


mysql-test/t/disabled.def:
  ndb - bug#21806

  disable ndb_binlog_discover as it's broken
  remove debug printout


mysql-test/t/disabled.def:
  disable ndb_binlog_discover as it's broken
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  remove debug printout

      affects basically all replication tests


storage/ndb/include/kernel/signaldata/SumaImpl.hpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  1) Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
  2) make sure to set NdbdNodeId on _TE_STOP
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperation.cpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing
storage/ndb/src/ndbapi/Ndbif.cpp:
  Fix signal data class SubTableData not to use Uint8 which can result in incorrect packing

  bug#21800 - 5.0 -> 5.1 merge


storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  bug#21800 - 5.0 -> 5.1 merge

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


sql/ha_ndbcluster.cc:
  Auto merged

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


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

  read TransactionDeadlockTimeout (for scans) to cater for insane settings


ndb/src/ndbapi/NdbScanOperation.cpp:
  read TransactionDeadlockTimeout to cater for insane settings

  Fix so that expand_check2 is only run per fragment,
  as restore now works 1 fragment at a time (again)


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Fix so that expand_check2 is only run per fragment,
    as restore now works 1 fragment at a time (again)

mysql-test/t/disabled.def:
  reenable "random" failing

  add another possible ok error in testcase


mysql-test/t/ndb_binlog_discover.test:
  add another possible ok error in testcase

  reenable some test after adding sync_with_master to end of test
    to make sure that binlog has been applied to slave before end of test


mysql-test/t/disabled.def:
  reenable test after adding extra sync_with_master
mysql-test/t/rpl_ndb_func003.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_ndb_idempotent.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_row_basic_7ndb.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_truncate_7ndb.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test

   fix incorrect assertion in dbacc


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix incorrect assertion

  better error message for creating table with non-existing tablespace


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  better error reporting
storage/ndb/src/ndbapi/ndberror.c:
  better error reporting

  fix bug in drop_file during pageout (LCP)


storage/ndb/src/kernel/blocks/pgman.cpp:
  1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
  2) Do all IO JBA
  3) Handle PAGEOUT during drop_file (caused by LCP)

  Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed
storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp:
  Fix bug in lcp during drop table
  Make sure that file thread is not started until meta data has completed

  Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
  This will hopefully remove some volatile testfailures in pushbuild
    (i've seen a couple by looking at logs)


mysql-test/ndb/ndb_config_1_node.ini:
  Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_2_node.ini:
  Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)
mysql-test/ndb/ndb_config_4_node.ini:
  Increase deadlock-timeout to cater for slow test-machines (possibly running several tests in parallell)

  init ndb_cache_check_time and honor value in my.cnf


sql/ha_ndbcluster.cc:
  init ndb_cache_check_time and honor value in my.cnf

  Fix ndb_condition_pushdown (5.0->5.1 merge error)


storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  Fix ndb_condition_pushdown

  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables


storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables
storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  Fix build failure if O_DIRECT is not defined
  Fix stack overflow by making odirect_readbuf global
  Remove soem old debug variables

  5.1-fix adopt to changes in node recovery


storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  ix totSendLenAi also in "new" node recovery

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


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  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/kernel/blocks/dbtup/DbtupPagMan.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
storage/ndb/src/mgmapi/ndb_logevent.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/test/ndbapi/testSystemRestart.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

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

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


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

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

  Handle also open && !OM_INIT wrt non function O_DIRECT


storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  Fix open wrt O_DIRECT

mysql-test/t/disabled.def:
  merge

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


mysql-test/t/ndb_autodiscover3.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

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

  this test in its current form depend on binlog format row