into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/mgmapi/ndbd_exit_codes.h:
  Auto merged
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  Auto merged
storage/ndb/src/kernel/error/ndbd_exit_codes.c:
  Auto merged

- updated error message to more correctly reflect the issue

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb

storage/ndb/src/ndbapi/Ndb.cpp:
  try to catch autoincr 'error 0'

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


storage/ndb/include/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/kernel/GlobalSignalNumbers.h:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/Ndb.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbApi.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/common/debugger/signaldata/SignalNames.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/Suma.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/kernel/blocks/suma/SumaInit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndb.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndberr.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbif.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/src/ndbapi/Ndbinit.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/include/HugoTransactions.hpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/ndbapi/Makefile.am:
  manual merge, removal of code from 5.0, not to be merged to 5.1
storage/ndb/test/src/HugoTransactions.cpp:
  manual merge, removal of code from 5.0, not to be merged to 5.1

- remove some event code to get rid of some bugs

    corrected error in invalidation of dict cache which may be causing the valgrind warning at times


sql/ha_ndbcluster_binlog.cc:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/DictCache.cpp:
  corrected error in invalidation of dict cache which may be causing the valgrind warning at times
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp:
  extra logging and asserts to try to track down the spurious completeCluster failure assetion

into  mysql.com:/data0/knielsen/tmp-5.1

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb


sql/ha_ndbcluster.cc:
  Auto merged

into  rt.int.sifira.dk:/usr/local/mysql/tmp-5.1

tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.


mysql-test/r/log_state.result:
  Fix hardcoded /tmp/ path.
mysql-test/t/log_state.test:
  Fix hardcoded /tmp/ path.

- make sure TE_ACTIVE event comes when node restarts so that ref counting is correct for drop of event

into  mysql.com:/home/mydev/mysql-5.1-amerge

into  mysql.com:/home/marty/MySQL/mysql-5.1-extra


sql/ha_ndbcluster.cc:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.1-amerge

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


sql/ha_ndbcluster.cc:
  manual merge af packported code to 5.0, use local copy
sql/handler.h:
  manual merge af packported code to 5.0, use local copy
sql/sql_update.cc:
  manual merge af packported code to 5.0, use local copy

- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update

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

into  mysql.com:/home/mydev/mysql-5.1-amerge


mysys/thr_lock.c:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
mysql-test/r/lock_multi.result:
  Manual merge
mysql-test/t/lock_multi.test:
  Manual merge
sql/lock.cc:
  Manual merge
sql/sql_base.cc:
  Manual merge
sql/sql_parse.cc:
  Manual merge
sql/sql_table.cc:
  Manual merge

into  mysql.com:/home/marty/MySQL/mysql-5.1-extra


sql/ha_ndbcluster.cc:
  Auto merged

COMMITs -- the numbers collapse to fill the gaps.


mysql-test/r/rpl_row_create_table.result:
  Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
  I don't fully understand this, but I can't see any harm to it.
mysql-test/t/rpl_row_create_table.test:
  Renumber event position.  This must be a result of extraneous COMMITs; see Bug#16206.
  I don't fully understand this, but I can't see any harm to it.

where it isn't.  Removed a test where the merge was incorrect (and a test 
duplicated.)


mysql-test/r/bdb.result:
  Removed binlog-format-specific test.
  
  Elliot says bdb is going away real soon now anyway.
mysql-test/r/binlog_row_blackhole.result:
  Removed superfluous commits.  Bug#16206.
mysql-test/r/mysqldump.result:
  Merged incorrectly.
mysql-test/t/bdb.test:
  Removed binlog-format-specific test.
  
  Elliot says bdb is going away real soon now anyway.

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1


BitKeeper/etc/ignore:
  auto-union
client/mysqldump.c:
  Auto merged
mysql-test/r/bdb.result:
  Auto merged
mysql-test/r/type_timestamp.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
mysql-test/t/type_timestamp.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/table.cc:
  Auto merged
mysql-test/r/func_time.result:
  manual merge
mysql-test/r/mysqldump.result:
  manual merge
mysql-test/t/func_time.test:
  manual merge
mysql-test/t/mysqldump.test:
  manual merge
sql/log.cc:
  manual merge
sql/sp_head.cc:
  manual merge
sql/sql_table.cc:
  manual merge

storage/ndb/test/ndbapi/test_event_merge.cpp:
  cannot skip tables if ops specified
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp:
  report even composite op in merge
  test case: test_event_merge --no-blobs --ops ic:dcic

into  dator5.(none):/home/pappa/bug17138


sql/item_sum.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged

into  dator5.(none):/home/pappa/bug17138


mysql-test/r/partition.result:
  manual merge
mysql-test/t/partition.test:
  manual merge

into  dator5.(none):/home/pappa/bug20583


mysql-test/r/partition.result:
  Auto merged
mysql-test/t/partition.test:
  Auto merged
sql/ha_partition.cc:
  Auto merged