into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/include/HugoOperations.hpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged
storage/ndb/test/src/HugoOperations.cpp:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Manual merge.
storage/ndb/test/ndbapi/testBasic.cpp:
  Manual merge.
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Manual merge.

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  SCCS merged

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

into  ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca


storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testNdbApi.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Manual merge.

into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb


storage/ndb/include/ndbapi/NdbOperation.hpp:
  Auto merged
storage/ndb/include/ndbapi/NdbScanOperation.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbOperationDefine.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
  Auto merged
storage/ndb/test/run-test/daily-basic-tests.txt:
  Auto merged

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

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

In a certain code path the NDBD could loop infinitely in the lock queue.


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix infinite loop.
storage/ndb/test/include/HugoOperations.hpp:
  Add optional hinting of TC for new transactions.
storage/ndb/test/ndbapi/testBasic.cpp:
  Add test case.
storage/ndb/test/run-test/daily-basic-tests.txt:
  Add test case.
storage/ndb/test/src/HugoOperations.cpp:
  Add optional hinting of TC for new transactions.

  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed


server-tools/instance-manager/thread_registry.cc:
  Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed

NdbTransaction::executeAsynch() was not implemented. Add implementation.


ndb/include/ndbapi/NdbTransaction.hpp:
  executeAsynch() should probably allow setting forceSend.
ndb/src/ndbapi/NdbTransaction.cpp:
  Add missing implementation of executeAsynch().
ndb/test/ndbapi/testNdbApi.cpp:
  Add test case.
ndb/test/run-test/daily-basic-tests.txt:
  Add new test.

into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb

Bug #24227  	ndb_size.pl should report default values instead of < default for config params
Bug #24229  	ndb_size.pl doesn't compute Index usage correctly

Big ndb_size.pl update


BitKeeper/deleted/.del-ndb_size.tmpl:
  Delete: storage/ndb/tools/ndb_size.tmpl
storage/ndb/tools/Makefile.am:
  ndb_size.tmpl no longer required
storage/ndb/tools/ndb_size.pl:
  total revamp.
  
  remove use of template, improve functionality.

- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test


mysql-test/r/windows.result:
  - Removed duplicate results.
mysql-test/t/windows.test:
  - Removed InnoDB requirement. 
  - Removed duplicate test case.
sql/ha_partition.cc:
  - Reverted changes from bug 26074 because it conflicts with bug 25141.

BitKeeper/deleted/.del-partition.inc:
  Delete: mysql-test/include/partition.inc

BitKeeper/deleted/.del-partition_not_windows.test:
  Exclude
BitKeeper/deleted/.del-partition_windows.result:
  Exclude
BitKeeper/deleted/.del-partition_windows.test:
  Exclude
mysql-test/include/partition.inc:
  Exclude
sql/sql_table.cc:
  Exclude

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

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


sql/ha_ndbcluster.cc:
  Auto merged

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


BitKeeper/etc/ignore:
  auto-union

into  alf.:D:/src/mysql-5.1-maint_pt

scripts/CMakeLists.txt:
  Fix broken bk native builds.
sql/log_event_old.cc:
  Fix for failing DBUG builds.

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


libmysqld/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb


sql/ha_ndbcluster.h:
  Auto merged

  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
  Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
  Merge


libmysqld/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/Makefile.am:
  Added compilation of ha_ndbcluster_cond
sql/ha_ndbcluster.cc:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster.h:
  Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
sql/ha_ndbcluster_cond.cc:
  Merge
sql/ha_ndbcluster_cond.h:
  Merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


include/m_ctype.h:
  Auto merged
include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/Makefile.am:
  Manual merge

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged
include/my_sys.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/grant.result:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
BitKeeper/deleted/.del-make_win_bin_dist:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


include/my_global.h:
  Auto merged

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint