mysql-test/r/archive.result:
  After merge fix. It might come from the fix for
  bug 1662 (ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY)
sql/time.cc:
  After merge fix. Auto resolve failed because this piece
  of code was moved from another file to here.

into  chilla.local:/home/mydev/mysql-5.1-ateam


libmysqld/lib_sql.cc:
  Auto merged
libmysqld/libmysqld.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/table.cc:
  Auto merged
storage/myisam/mi_check.c:
  Auto merged
storage/myisam/mi_create.c:
  Auto merged
storage/myisam/mi_delete_table.c:
  Auto merged
storage/myisam/mi_dynrec.c:
  Auto merged
storage/myisam/mi_key.c:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
storage/myisam/rt_index.c:
  Auto merged
storage/myisam/rt_mbr.c:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Manual merge
mysql-test/r/key.result:
  Manual merge
mysql-test/t/ctype_utf8.test:
  Manual merge
sql/item_timefunc.cc:
  Manual merge

into  chilla.local:/home/mydev/mysql-5.1-ateam

  Delete: mysql-test/r/ndb_dd_advance.result
.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test


BitKeeper/deleted/.del-ndb_dd_advance.test~58e757b6c1d33996:
  Delete: mysql-test/t/ndb_dd_advance.test
BitKeeper/deleted/.del-ndb_dd_advance2.test~e9e56bc3e8e8f740:
  Delete: mysql-test/t/ndb_dd_advance2.test
BitKeeper/deleted/.del-ndb_dd_advance2.result~89be9fe55c2fda5a:
  Delete: mysql-test/r/ndb_dd_advance2.result
BitKeeper/deleted/.del-ndb_dd_advance.result~165b282a93715547:
  Delete: mysql-test/r/ndb_dd_advance.result

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1

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

- reenabled test as this now seems fixed

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'

scripts/make_binary_distribution.sh:
  Auto merged

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:/home/mydev/mysql-5.0-ateam


myisam/mi_dynrec.c:
  Auto merged

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_key.c:
  Auto merged
mysql-test/r/gis-rtree.result:
  Auto merged
mysql-test/t/gis-rtree.test:
  Auto merged
myisam/mi_check.c:
  SCCS merged

into  mysql.com:/home/mydev/mysql-5.0-ateam


libmysqld/libmysqld.c:
  Auto merged
myisam/mi_rkey.c:
  Auto merged
mysql-test/r/func_sapdb.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/func_sapdb.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/item_geofunc.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
libmysqld/lib_sql.cc:
  Manual merge
mysql-test/r/func_time.result:
  Manual merge
mysql-test/r/gis.result:
  Manual merge
mysql-test/t/func_time.test:
  Manual merge
mysql-test/t/gis.test:
  Manual merge
sql-common/client.c:
  Manual merge

into  mysql.com:/home/mydev/mysql-5.0-ateam


myisam/mi_create.c:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/key.result:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
mysql-test/t/key.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
sql/field.cc:
  Manual merge

into  mysql.com:/home/ndbdev/ngrishakin/mysql-5.1

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  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-engines-merge


sql/mysqld.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.

into  mysql.com:/home/mydev/mysql-4.1-bug14400


myisam/mi_rkey.c:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge
sql/sql_class.cc:
  Bug#14400 - Query joins wrong rows from table which is subject of "concurrent insert"
  Manual merge

- 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