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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

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

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


sql/ha_ndbcluster_cond.cc:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/common/debugger/EventLogger.cpp:
  Auto merged
storage/ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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


sql/ha_ndbcluster.cc:
  Auto merged

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

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

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


storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
  Auto merged
storage/ndb/test/src/HugoTransactions.cpp:
  Auto merged
storage/ndb/test/src/Makefile.am:
  merge

  Dont add insert+delete tuple(s) to lcp-keep-list

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

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

mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2-master.opt -> mysql-test/suite/ndb_team/t/ndb_autodiscover2-master.opt
mysql-test/suite/ndb_team/t/ndb_autodiscover2.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover2.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover2.test
mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover.test
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
  Rename: mysql-test/suite/ndb/t/ndb_autodiscover3.test -> mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
mysql-test/suite/ndb_team/r/ndb_autodiscover.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover.result
mysql-test/suite/ndb_team/r/ndb_autodiscover2.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover2.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover2.result
mysql-test/suite/ndb_team/r/ndb_autodiscover3.result:
  Rename: mysql-test/suite/ndb/r/ndb_autodiscover3.result -> mysql-test/suite/ndb_team/r/ndb_autodiscover3.result
mysql-test/suite/ndb_team/t/disabled.def:
  BitKeeper file /home/tomas/mysql-5.1-new-ndb/mysql-test/suite/ndb_team/t/disabled.def

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug27543


storage/ndb/tools/restore/Restore.cpp:
  Remove additional space when merge

into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug30024


storage/ndb/tools/restore/Restore.cpp:
  Auto merged

mysql-test/Makefile.am:
  Add install data for new test case
storage/ndb/tools/restore/Restore.cpp:
  Convert blob(text) length stored in main table
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_be/BACKUP-1.2.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.1.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1-0.2.Data:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.1.log:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.ctl:
  test data for endian test
mysql-test/std_data/ndb_backup51_data_le/BACKUP-1.2.log:
  test data for endian test
mysql-test/suite/ndb/r/ndb_restore_different_endian_data.result:
  test result for endian test
mysql-test/suite/ndb/t/ndb_restore_different_endian_data.test:
  test case for endian test

- problem is the database name accessed in Rows_log_event write... get_db() which is a pointer to the share string...
- point to table map instead?
- or copy it?
- or make sure that anything interacting with the share happens _after_ the epoch

Problem with flush is that STMT_END_F may not be included as it shoudld...

this flush with flag TRUE causes spurious errors in the binlog... as it will insert a STMT_END_F... and hence an invalid binlog (missing table mappings)

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

  forgot to update next TC no

storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  merge error code(s)
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge error code(s)
storage/ndb/test/ndbapi/testIndex.cpp:
  merge error code(s)

  When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
  (found by pekkas blob changes)


storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
  When adding a read to lock queue, where there is a X-lock ahead, upgrade to X-lock
  (found by pekkas blob changes)

  remove more "extra mysql-"


storage/ndb/test/run-test/autotest-run.sh:
  remove more "extra mysql-"

 add --tag
 remove prepended mysql-
  add conf-test.cnf
  add embryo upgrade-boot.sh


storage/ndb/test/run-test/Makefile.am:
  add test test conf
storage/ndb/test/run-test/autotest-boot.sh:
  add --tag to autotest
  remove "extra" appended mysql- to all scripts
storage/ndb/test/run-test/autotest-run.sh:
  remove extra "mysql-"
storage/ndb/test/run-test/conf-test.cnf:
  New BitKeeper file ``storage/ndb/test/run-test/conf-test.cnf''
storage/ndb/test/run-test/upgrade-boot.sh:
  New BitKeeper file ``storage/ndb/test/run-test/upgrade-boot.sh''

sql/ha_ndbcluster.cc:
  Bug#20872 master*.err: miscellaneous error messages
  - only allocate share if fully successfull
sql/ha_ndbcluster_binlog.cc:
  Bug#20872 master*.err: miscellaneous error messages
  - only allocate share if fully successfull
  - no need to print error, my_errno is set
sql/ha_ndbcluster_binlog.h:
  Bug#20872 master*.err: miscellaneous error messages
  - only allocate share if fully successfull

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

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


sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbBlob.cpp:
  Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
  Auto merged
storage/ndb/test/ndbapi/testIndex.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
  manual merge
storage/ndb/src/ndbapi/ndberror.c:
  manual merge
storage/ndb/test/run-test/daily-basic-tests.txt:
  manual merge

sql/ha_ndbcluster.cc:
  remove warning for table exists in mysqld error log
sql/ha_ndbcluster_binlog.cc:
  remove warning for table exists in mysqld error log

into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge


mysql-test/Makefile.am:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
storage/ndb/tools/restore/Restore.cpp:
  Auto merged
storage/ndb/tools/restore/restore_main.cpp:
  Auto merged
mysql-test/suite/ndb/r/ndb_restore_compat.result:
  Auto merged
mysql-test/suite/ndb/t/ndb_restore_compat.test:
  Auto merged

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

  Do not convert innodb autoincrement value to little endian when on
  big endian systems.


storage/innobase/row/row0sel.c:
  Do not convert innodb autoincrement value to little endian when on
  big endian systems.