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


mysql-test/r/view.result:
  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-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  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

storage/ndb/test/include/DbUtil.hpp:
  Add support for SqlResultSet
storage/ndb/test/ndbapi/Makefile.am:
  Add testNDBT
storage/ndb/test/src/DbUtil.cpp:
  Add support for SqlResultSet
storage/ndb/test/src/Makefile.am:
  Build AtrtClient
storage/ndb/test/include/AtrtClient.hpp:
  New BitKeeper file ``storage/ndb/test/include/AtrtClient.hpp''
storage/ndb/test/ndbapi/testNDBT.cpp:
  New BitKeeper file ``storage/ndb/test/ndbapi/testNDBT.cpp''
storage/ndb/test/src/AtrtClient.cpp:
  New BitKeeper file ``storage/ndb/test/src/AtrtClient.cpp''

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug29851


mysql-test/suite/ndb/r/ndb_alter_table2.result:
  C
  ul.
  C
sql/ha_ndbcluster.cc:
  c

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/ERROR_codes.txt:
  Auto merged
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  merge

  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet


storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  new error codes
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  dont assume that page is "all empty"
  only as gci is acked, as release_gci might not have processed it yet
storage/ndb/test/ndbapi/test_event.cpp:
  testcase
storage/ndb/test/run-test/daily-basic-tests.txt:
  testcase

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged

  Updated to build NdbRepStress


storage/ndb/test/ndbapi/Makefile.am:
  Updated to build NdbRepStress

  Updated for name chance on dbutil


storage/ndb/test/src/Makefile.am:
  Updated for name chance on dbutil

into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
sql/log.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into  kaamos.(none):/data/src/opt/mysql-5.0-opt


client/mysql.cc:
  Auto merged

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/filesort.cc:
  Auto merged

into  moonbone.local:/work/33675-bug-5.0-opt-mysql

  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.


sql/filesort.cc:
  Bug#33675: Usage of an uninitialized memory by filesort in a subquery caused
  server crash.
  Free smaller buffer before allocating bigger one.

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/mysql-5.0-ndb-bj


mysql-test/r/view.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj