ndb/test/include/NDBT_Test.hpp:
  compile warnings
ndb/test/ndbapi/bank/BankLoad.cpp:
  compile warnings
ndb/test/ndbapi/testOIBasic.cpp:
  compile warnings
ndb/test/src/HugoCalculator.cpp:
  compile warnings
ndb/test/src/NDBT_Test.cpp:
  compile warnings
ndb/test/src/NdbBackup.cpp:
  compile warnings
ndb/test/src/NdbRestarts.cpp:
  compile warnings

into mysql.com:/home/jonas/src/mysql-5.0-ndb

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0-ndb

sql/ha_ndbcluster.cc:
  removed compiler warnings

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/ndb_index_ordered.result:
  Auto merged
mysql-test/t/ndb_index_ordered.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

a note, not a warning or error.

into mysql.com:/home/jonas/src/mysql-4.1

ndb/src/common/transporter/TransporterRegistry.cpp:
  make it compile with -ansi -pedantic
sql/sql_lex.cc:
  a fix for compile-time failure

mysql-test/r/ndb_index_ordered.result:
  Test scan with invalid table version
mysql-test/t/ndb_index_ordered.test:
  Test scan with invalid table version
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Set apiConnectstate= CS_ABORTING when receving a scan req with invalid
    table version

into mysql.com:/home/kostja/work/mysql-5.0-root


sql/net_serv.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

(Bug#7428) (renamed: hash_reset -> my_hash_reset)


mysys/hash.c:
  renamed: hash_reset -> my_hash_reset
sql/sql_class.h:
  hash_reset -> my_hash_reset

into mysql.com:/home/jonas/src/mysql-5.0-ndb

into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged

into mysql.com:/home/jonas/src/mysql-5.0


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged

into mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

ndb/src/common/portlib/NdbThread.c:
  Use double stack for 64-bit

into mysql.com:/home/jwinstead2/mysql-5.0-clean


BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/etc/gone:
  auto-union
innobase/os/os0file.c:
  Auto merged
sql-common/client.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/set_var.cc:
  Auto merged

into mysql.com:/home/jwinstead2/mysql-4.1-clean

into mysql.com:/home/jwinstead2/mysql-4.1-clean

sql/examples/ha_archive.cc:
  Fix style

  Did some more split TABLE to TABLE and TABLE_SHARE


sql/field.cc:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'
sql/field.h:
  Field 'db_low_byte_first' of 'struct st_table' is now in TABLE_SHARE sub struct 's'

sql/examples/ha_archive.cc:
  Fix redundant initialization of share->mutex
  Fix error handling to always clean up correctly
  Fix a couple of warnings

into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0

into mysql.com:/home/mysql_src/mysql-5.0-clean

into mysql.com:/home/mysql_src/mysql-4.1-clean

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/mysql-5.0