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

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


storage/ndb/include/util/Bitmask.hpp:
  Auto merged
storage/ndb/src/common/util/Bitmask.cpp:
  merge
storage/ndb/test/ndbapi/testBitfield.cpp:
  merge

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


ndb/src/common/util/Bitmask.cpp:
  merge
ndb/test/ndbapi/testBitfield.cpp:
  merge

    make sure that getField does not write after supplied buffer
    (recommit to correct clone, for easy merging)


ndb/include/util/Bitmask.hpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/src/common/util/Bitmask.cpp:
  ndb- bug#33750
        make sure that getField does not write after supplied buffer
ndb/test/ndbapi/testBitfield.cpp:
  move test from Bitmask.cpp into testBitfield
        for automatic testing

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


storage/ndb/src/ndbapi/Ndb.cpp:
  Using local, will merge manually.
storage/ndb/include/ndbapi/Ndb.hpp:
  Changed parameter name to better reflect meaning.

  Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb_restore.result, ndb_restore.test:
  Changed test to use information_schema to check auto_increment
DictCache.cpp, Ndb.cpp:
  Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node. When setting the auto_increment value we'll also read up the new value, this is useful if we use the table the first time in this MySQL Server and haven't yet seen the NEXTID value. The kernel will avoid updating since it already has the value but will also read up the NEXTID value to ensure we don't need to do this any more time.
ndb_auto_increment.result:
  Updated result file since it was incorrect


ndb/include/ndbapi/Ndb.hpp:
  Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.hpp:
  Add new variable m_highest_seen when only peeking at auto_increment NEXTID and not retrieving to cache. Add new method to check tupleId before calling data node
ndb/src/ndbapi/DictCache.cpp:
  Add new variable m_highest_seen when only peeking at auto_increment NEXTID
  and not retrieving to cache. Add new method to check tupleId before calling
  data node. When setting the auto_increment value we'll also read up the new
  value, this is useful if we use the table the first time in this MySQL Server
  and haven't yet seen the NEXTID value. The kernel will avoid updating since it
  already has the value but will also read up the NEXTID value to ensure we
  don't need to do this any more time.
ndb/src/ndbapi/Ndb.cpp:
  Add new variable m_highest_seen when only peeking at auto_increment NEXTID
  and not retrieving to cache. Add new method to check tupleId before calling
  data node. When setting the auto_increment value we'll also read up the new
  value, this is useful if we use the table the first time in this MySQL Server
  and haven't yet seen the NEXTID value. The kernel will avoid updating since
  it already has the value but will also read up the NEXTID value to ensure we
  don't need to do this any more time.
mysql-test/r/ndb_restore.result:
  Changed test to use information_schema to check auto_increment
mysql-test/t/ndb_restore.test:
  Changed test to use information_schema to check auto_increment
mysql-test/r/ndb_auto_increment.result:
  Updated result file since it was incorrect