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

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

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


storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  merge
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  merge

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


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  merge

storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  jamify DbtupDiskAlloc
storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  jamify DbtupDiskAlloc
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  jamify DbtupDiskAlloc

  remove LCP-snapshot from MM-tables,
  removing possibility of spurious 899 on MM-tables


storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp:
  dont run LCP-snapshot on pure MM-tables,
  this is implemented by not setting frag.m_lcp_scan_op
  which will make TUP_COMMIT do nothing

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

(recommit)


extra/yassl/src/template_instnt.cpp:
  new template instantiation (recommit)

- The errno variable should only be used when the previous socket
  write failed, it should be regarded as undefined at other times

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


mysql-test/r/view.result:
  Auto merged

  Sample cluster configuration files for 5.1
Makefile.am:
  Updated for new files


support-files/config.huge.ini.sh:
  Sample cluster configuration files for 5.1
support-files/config.medium.ini.sh:
  Sample cluster configuration files for 5.1
support-files/config.small.ini.sh:
  Sample cluster configuration files for 5.1
support-files/Makefile.am:
  Updated for new files

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

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

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

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

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


mysql-test/r/view.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
storage/ndb/test/ndbapi/testBitfield.cpp:
  Auto merged

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

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


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-bj

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

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


storage/ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

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


ndb/src/common/transporter/TCP_Transporter.cpp:
  Auto merged

  make sure whole send buffer is flushed, even when wrapping around end


ndb/src/common/transporter/TCP_Transporter.cpp:
  ndb - bug#34005
    make sure whole send buffer is flush, even when wrapping around end

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

  Changed function attribute names to match implementation


ndb/include/ndbapi/Ndb.hpp:
  Changed function attribute names to match implementation

  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
ndb_restore.result:
  Updated result file


mysql-test/suite/ndb/r/ndb_restore.result:
  Updated result file
sql/ha_ndbcluster.cc:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
storage/ndb/include/ndbapi/Ndb.hpp:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
storage/ndb/src/ndbapi/Ndb.cpp:
  Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.

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


storage/ndb/src/common/util/Bitmask.cpp:
  merge