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


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged

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


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  merge
sql/ha_ndbcluster.cc:
  merge

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017

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


sql/ha_ndbcluster.cc:
  ul

sql/ha_ndbcluster.cc:
  calculate frags with (ulonglong)max_rows in case --without-big-tables

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

mysql-test/r/grant.result:
  Update result file format to 5.1 version

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


mysql-test/t/disabled.def:
  Auto merged

mysql-test/t/disabled.def:
  reenable "random" failing

  add another possible ok error in testcase


mysql-test/t/ndb_binlog_discover.test:
  add another possible ok error in testcase

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-ndb

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


sql/sql_show.cc:
  Auto merged

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


mysql-test/t/disabled.def:
  Auto merged
storage/ndb/src/ndbapi/ndberror.c:
  Auto merged

  reenable some test after adding sync_with_master to end of test
    to make sure that binlog has been applied to slave before end of test


mysql-test/t/disabled.def:
  reenable test after adding extra sync_with_master
mysql-test/t/rpl_ndb_func003.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_ndb_idempotent.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_row_basic_7ndb.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test
mysql-test/t/rpl_truncate_7ndb.test:
  add sync slave with master, to make sure that binlog has been applied to slave before end of test

   fix incorrect assertion in dbacc


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  Fix incorrect assertion

into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017


storage/ndb/include/kernel/signaldata/CreateIndx.hpp:
  SCCS merged
storage/ndb/include/kernel/signaldata/DropIndx.hpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  SCCS merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  SCCS merged
storage/ndb/src/kernel/vm/DLHashTable2.hpp:
  SCCS merged
storage/ndb/test/include/NDBT_Tables.hpp:
  SCCS merged
storage/ndb/test/ndbapi/testDict.cpp:
  manual
storage/ndb/test/src/NDBT_Tables.cpp:
  SCCS merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1

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

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
mysql-test/t/func_time.test:
  Manual merge.

because searching for them makes the script abort with all non-NDB builds.


mysql-test/mysql-test-run.pl:
  Checking with "mtr_exe_exists()" for the location of a binary will yield an error
  if the binary is found nowhere at all, and this happens with NDB binaries in all
  builds that do not contain NDB;  so the correct way is fixed path names only.
  Still part of the fix for the #21721 bug.

  Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb


BitKeeper/deleted/.del-ha_berkeley.m4:
  Delete: config/ac-macros/ha_berkeley.m4
BUILD/FINISH.sh:
  Removed more referenses to bdb
BUILD/compile-alpha-cxx:
  Removed more referenses to bdb
BUILD/compile-alpha-debug:
  Removed more referenses to bdb
BUILD/compile-dist:
  Removed more referenses to bdb
BUILD/compile-ia64-debug-max:
  Removed more referenses to bdb
CMakeLists.txt:
  Removed more referenses to bdb
Makefile.am:
  Removed more referenses to bdb
libmysqld/lib_sql.cc:
  Removed more referenses to bdb
sql/mysql_priv.h:
  Removed more referenses to bdb
storage/ndb/config/win-prg.am:
  Removed more referenses to bdb
storage/ndb/test/run-test/ndb-autotest.sh:
  Removed more referenses to bdb
support-files/my-huge.cnf.sh:
  Removed more referenses to bdb
support-files/my-large.cnf.sh:
  Removed more referenses to bdb
support-files/my-medium.cnf.sh:
  Removed more referenses to bdb

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

  better error message for creating table with non-existing tablespace


storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  better error reporting
storage/ndb/src/ndbapi/ndberror.c:
  better error reporting

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

  fix bug in drop_file during pageout (LCP)


storage/ndb/src/kernel/blocks/pgman.cpp:
  1) Allow Page_entry::REQUEST, when dropping page (in drop_file path)
  2) Do all IO JBA
  3) Handle PAGEOUT during drop_file (caused by LCP)

      (mysql-test-run only)


mysql-test/ndb/ndb_config_1_node.ini:
  revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_2_node.ini:
  revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/ndb/ndb_config_4_node.ini:
  revert timeout changes, as a test depends on it, it mysterious ways
mysql-test/t/rpl_ndb_basic.test:
  revert timeout changes, as a test depends on it, it mysterious ways

sql/set_var.cc:
  Fix for bug #21642: "configure" with no arguments does not build
  Added #ifdefs around innodb server variables

mysql-test/r/gis.result:
  result fixed
sql/item_geofunc.cc:
  new_field->init() call added

mysql-test/mysql-test-run.pl:
  In 5.1 packages, the binaries "ndbd" and "ndb_mgmd" are in subdirectory "bin", not in "libexec".
  Use the search function "mtr_exe_exists()", in case there might be exceptions.

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

ndb/src/kernel/vm/DLHashTable2.hpp:
  add isEmpty for use in DICT
ndb/test/include/NDBT_Tables.hpp:
  getIndexes - return index cols of standard test table
ndb/test/src/NDBT_Tables.cpp:
  getIndexes - return index cols of standard test table
ndb/test/ndbapi/testDict.cpp:
  bug#21017: index create/drop during NR
ndb/include/kernel/signaldata/CreateIndx.hpp:
  add 711
ndb/include/kernel/signaldata/DropIndx.hpp:
  add 711
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  block index create/drop during NR.
  fix 2 ndbrequires by checking exact schema op types

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


mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged

instance.cc:
  Removed wrongly placed closing brace
item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*


server-tools/instance-manager/instance.cc:
  Removed wrongly placed closing brace
sql/item_geofunc.cc:
  needed to pass in a TABLE_SHARE* instead of a TABLE*

fix for change of deadlock timeout in config.ini


mysql-test/t/rpl_ndb_basic.test:
  fix for change of deadlock timeout in config.ini

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


mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
mysql-test/t/disabled.def:
  SCCS merged
sql/ha_ndbcluster.cc:
  e
  merge

BitKeeper/deleted/.del-readme-renamed:
  Rename: BitKeeper/deleted/.del-readme -> BitKeeper/deleted/.del-readme-renamed

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


client/mysql.cc:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/gis.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/r/im_life_cycle.result:
  Auto merged
mysql-test/r/information_schema_db.result:
  Auto merged
mysql-test/r/type_newdecimal.result:
  Auto merged
mysql-test/r/type_ranges.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/gis.test:
  Auto merged
mysql-test/t/im_life_cycle.imtest:
  Auto merged
mysql-test/t/type_newdecimal.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
server-tools/instance-manager/messages.cc:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0


BitKeeper/deleted/.del-mysql_client.result:
  Auto merged
BitKeeper/deleted/.del-mysql_client.test:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged