into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-ndb


storage/ndb/src/common/util/OutputStream.cpp:
  Auto merged

  During TC-take-over (NF) the new-TC builds up a new transaction state
  And commits operation according to this state.
  However, in the new state that is build, the operations does not have to be in same order, as "real" state
  In the multi-update-case, this means that operations can be commit in "incorrect" order

  i.e update A, delete A, insert A is normally commited in same order as prepared
      but can be committed in any order

  This patch changes TUP handling of these out-order commits, and previous implementation
    could confuse the TUX triggers


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  new method
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
  move removeActiveOpList, cause it's now only used by DbtupAbort
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  - move tux-trigger execution *before* check of disk, since ops can be committed during a disk timeslice
  - allow out-of-order commits and use tuple_ptr->m_operation_ptr_i for determening "real" commit
    (instead of re-ordering operations on the fly, which confused tux-triggers)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  use constant instead of number
storage/ndb/test/run-test/daily-basic-tests.txt:
  "old-51" does not yet support --nologging

  testcases


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  new error codes
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  remove assert
storage/ndb/test/ndbapi/testNodeRestart.cpp:
  new testcase
  1) -n Bug34216
     Which tests node diying during multip-op commit
     Very controlled
  
  2) -n mixedmultiop
     Runs several threads "load" of same scenario...not very controlled
storage/ndb/test/run-test/daily-basic-tests.txt:
  new testcases

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

- in autocommit do not allocate statistics share, but instead use one directly on the handler

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/common/debugger/SignalLoggerManager.cpp:
  Auto merged
storage/ndb/src/common/debugger/signaldata/ScanTab.cpp:
  Auto merged
storage/ndb/src/kernel/vm/pc.hpp:
  Auto merged

ndb/src/common/debugger/SignalLoggerManager.cpp:
  some warnings, debug errors
ndb/src/common/debugger/signaldata/ScanTab.cpp:
  some warnings, debug errors
ndb/src/kernel/vm/pc.hpp:
  some warnings, debug errors

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb


storage/ndb/src/ndbapi/Ndb.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged

ndb/src/ndbapi/Ndb.cpp:
  fix pthread_t abuse
ndb/test/ndbapi/testOIBasic.cpp:
  fix pthread_t abuse

  make sure to alloc logspace and set bits
  if doing delete after previous update wo/ touching DD part


mysql-test/suite/ndb/r/ndb_dd_basic.result:
  testcase
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  testcase

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


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged

  remove incorrect ndbrequire

into  mysql.com:/usr/clones/mysql-5.1-new-ndb2

  Updated with new support function from Magnus push to dbutil


storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp:
  Updated with new support function from Magnus push to dbutil

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb

storage/ndb/src/ndbapi/ndberror.c:
  post-merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  enable testInterpreter

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107


storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  ul, fix next

ndb/test/ndbapi/testInterpreter.cpp:
  bug#34107 testInterpreter test case
ndb/test/run-test/daily-basic-tests.txt:
  bug#34107 testInterpreter test case

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107


mysql-test/suite/ndb/r/ndb_condition_pushdown.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_condition_pushdown.test:
  Auto merged
storage/ndb/include/ndbapi/ndbapi_limits.h:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  silly stuff
storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  a name was improved in 5.1
storage/ndb/src/ndbapi/ndberror.c:
  use local due to huge bogus diff

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107

mysql-test/r/ndb_condition_pushdown.result:
  bug#34107 lower scanfilter max size to not hit TUP limit
mysql-test/t/ndb_condition_pushdown.test:
  bug#34107 lower scanfilter max size to not hit TUP limit
ndb/include/ndbapi/ndbapi_limits.h:
  bug#34107 lower scanfilter max size to not hit TUP limit

ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#34107 check stored proc overflow
ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#34107 check stored proc overflow
ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp:
  bug#34107 check stored proc overflow
ndb/src/ndbapi/ndberror.c:
  bug#34107 check stored proc overflow

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


storage/ndb/src/kernel/blocks/backup/Backup.cpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable.hpp:
  Auto merged
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  merge

  make sure release of not added ptr does not corrupt hashtable

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

  Backup can assert with "big" table definitions
  Correct condition before fetching next meta-table
  Increase meta-buffer, to cope with atleast 2 tables


ndb/src/kernel/blocks/backup/Backup.cpp:
  Correct condition, before fetching new meta-table
ndb/src/kernel/blocks/backup/Backup.hpp:
  Make sure atleast 2 tables can fix

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34118

mysql-test/suite/ndb/r/ndb_dd_basic.result:
  bug#34118 hash index trigger disk flag
mysql-test/suite/ndb/t/ndb_dd_basic.test:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#34118 hash index trigger disk flag
storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp:
  bug#34118 hash index trigger disk flag

mysql-test/suite/ndb/t/ndb_bug31477.test:
  Rename: mysql-test/t/ndb_bug31477.test -> mysql-test/suite/ndb/t/ndb_bug31477.test
mysql-test/suite/ndb/r/ndb_bug31477.result:
  Rename: mysql-test/r/ndb_bug31477.result -> mysql-test/suite/ndb/r/ndb_bug31477.result

storage/ndb/src/kernel/vm/NdbdSuperPool.cpp:
  rename Ndbd_mem_manager::log2 to ndb_log2
storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp:
  rename Ndbd_mem_manager::log2 to ndb_log2
storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp:
  rename Ndbd_mem_manager::log2 to ndb_log2

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#31477 post-merge fixes in 5.1
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  bug#31477 post-merge fixes in 5.1
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  bug#31477 post-merge fixes in 5.1

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug31477


storage/ndb/include/ndbapi/Ndb.hpp:
  Auto merged
storage/ndb/src/common/util/NdbOut.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged
storage/ndb/test/ndbapi/testOIBasic.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  mindless merge
storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  mindless merge

into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug31477

mysql-test/r/ndb_bug31477.result:
  BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/r/ndb_bug31477.result
mysql-test/t/ndb_bug31477.test:
  BitKeeper file /export/space/pekka/ndb/version/my50-bug31477/mysql-test/t/ndb_bug31477.test
ndb/src/common/util/NdbOut.cpp:
  missing comma, causing weird Uint64 printout
ndb/test/ndbapi/testOIBasic.cpp:
  adjust params
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug#31477 - explicit rewrite of tuxQueryTh
  if active op then non-dirty scan enters lock queue via TUX
  instead of skipping the tuple
ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp:
  bug#31477 - explicit rewrite of tuxQueryTh
  if active op then non-dirty scan enters lock queue via TUX
  instead of skipping the tuple
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  bug#31477 - explicit rewrite of tuxQueryTh
  if active op then non-dirty scan enters lock queue via TUX
  instead of skipping the tuple

into  mysql.com:/home/marty/MySQL/mysql-5.0-ndb


ndb/include/ndbapi/Ndb.hpp:
  Auto merged

into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.cc:
  Auto merged

  Changed to use information_schema to check auto_increment
Ndb.cpp:
  Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields
ndb_auto_increment.result:
  Regenerated result


mysql-test/suite/ndb/r/ndb_auto_increment.result:
  Regenerated result
mysql-test/suite/ndb/r/ndb_restore.result:
  Changed to use information_schema to check auto_increment
mysql-test/suite/ndb/t/ndb_restore.test:
  Changed to use information_schema to check auto_increment
storage/ndb/src/ndbapi/Ndb.cpp:
  Bug #33534   Bad performance of INSERT's in auto_incremented tables: Saving highest seen value when setting auto_increment fields

into  mysql.com:/data1/mysql-5.1-new-ndb

  Needed to add the new sample configuration files to the CLEANFILES section


support-files/Makefile.am:
  Needed to add the new sample configuration files to the CLEANFILES section