BUILD/FINISH.sh:
  Auto merged
BUILD/SETUP.sh:
  Auto merged
BUILD/compile-alpha:
  Auto merged
BUILD/compile-pentium-gcov:
  Auto merged
BUILD/compile-pentium-gprof:
  Auto merged
BUILD/compile-pentium:
  Auto merged
BitKeeper/deleted/.del-my_new.cc:
  Delete: mysys/my_new.cc
Build-tools/Do-compile:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
bdb/dist/configure.in:
  Auto merged
client/Makefile.am:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0crea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/srv/srv0start.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/t/join.test:
  Auto merged
mysys/Makefile.am:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/my_lock.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/my-huge.cnf.sh:
  Auto merged
support-files/my-large.cnf.sh:
  Auto merged
support-files/my-medium.cnf.sh:
  Auto merged
support-files/my-small.cnf.sh:
  Auto merged
configure.in:
  merge
innobase/row/row0mysql.c:
  merge
innobase/trx/trx0trx.c:
  merge
mysql-test/r/innodb.result:
  merge
mysql-test/r/join.result:
  merge
sql/ha_innodb.cc:
  merge
sql/slave.cc:
  merge

sql/sql_table.cc:
  Fixed comment

Docs/manual.texi:
  Update information about IS NULL.
myisam/myisamchk.c:
  Portability fix
sql/mysqld.cc:
  Changed log_long_queries -> log_slow_queries

mysql-test/mysql-test-run.sh:
  Cleanup

Build-tools/Do-compile:
  Fixed 'touch' and 'chmod' of files.
Docs/manual.texi:
  Changelog

into donna.mysql.fi:/home/heikki/mysqln

  If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns


innobase/srv/srv0srv.c:
  If the default character set was set to non-latin1 then the collation order of DATA_CHAR and DATA_VARCHAR was not defined, and foreign key system tables did not work, because they contain DATA_VARCHAR columns

into mysql.sashanet.com:/reiser-data/mysql-4.0

got LOAD DATA INFILE replication from 3.23 master to 4.0 slave to work
for some reason query_cache now fails - will push anyway and document the
failure if I can repeat it.


client/mysqltest.c:
  added require_version
mysql-test/mysql-test-run.sh:
  added --master-binary=,--slave-binary=,--old-master options
  sleep_until_file_exists -> sleep_until_file_created
sql/slave.cc:
  fixed bug in LOAD DATA INFILE replication from 3.23 master

Build-tools/Do-compile:
  added options 'version-suffix'

Docs/manual.texi:
  Cleanup
myisam/myisampack.c:
  Removed warning
sql/handler.cc:
  cleanup
sql/slave.cc:
  Removed not used var

  Still a little better error message for Harald Fuchs


innobase/dict/dict0crea.c:
  Still a little better error message for Harald Fuchs

  Add some error messages to help in tracking Harald Fuchs' foreign key failure


innobase/dict/dict0crea.c:
  Add some error messages to help in tracking Harald Fuchs' foreign key failure

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

sql/mysql_priv.h:
  Auto merged

Added counting of rollback's and commits
Fixed bug in 'SELECT 0 LIMIT 0'
Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'


Docs/manual.texi:
  Changelog
configure.in:
  Cleanup
myisam/myisamchk.c:
  Fix some bugs introduced with the new my_getopt
mysql-test/r/limit.result:
  Test for bugfix
mysql-test/r/rpl000001.result:
  fix wrong result
mysql-test/r/select.result:
  Fix things after fixing ignore index()
mysql-test/r/select_found.result:
  Test of bug in SQL_CALC_FOUND_ROWS
mysql-test/t/limit.test:
  Test bug in LIMIT 0
mysql-test/t/rpl000001.test:
  fix wrong result
mysql-test/t/select_found.test:
  Test of bug in SQL_CALC_FOUND_ROWS
sql/handler.cc:
  Added counting of rollback's and commits
sql/mysql_priv.h:
  Added counting of rollback's and commits
sql/mysqld.cc:
  Added counting of rollback's and commits
sql/sql_select.cc:
  Fixed bug in 'SELECT 0 LIMIT 0'
  Fixed bug in 'SELECT SQL_CALC_FOUND_ROWS'

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed bug in LOAD DATA FROM MASTER
fixed rpl000001.result
Slave now replicates 3.23 master, with the exception of LOAD DATA INFILE, 
which is still buggy. Will push this one after the pull/merge


mysql-test/r/rpl000001.result:
  fixed bug in result
sql/log_event.cc:
  fixes for slave backward compat
sql/log_event.h:
  fixes for slave backward compat
sql/mysql_priv.h:
  fixes for slave backward compat
sql/net_serv.cc:
  fixes for slave backward compat
sql/repl_failsafe.cc:
  fixed bug in LOAD DATA FROM MASTER
sql/slave.cc:
  fixes for slave backward compat
sql/slave.h:
  fixes for slave backward compat
sql/sql_load.cc:
  fixes for slave backward compat

sql/ha_innobase.cc:
  Auto merged

Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

  Prevent a foreign key constraint references between INT columns where the signedness is different


innobase/rem/rem0cmp.c:
  Prevent a foreign key constraint references between INT columns where the signedness is different

include/my_getopt.h:
  Removed a member from my_getopt struct.
myisam/myisamchk.c:
  pdated myisamchk. More features in use from my_getopt
mysys/my_getopt.c:
  Fixed a bug in handle_options(). Short options were not tested
  whether existed when given from the command line. Fixed a bug
  in getopt_ll, got division by zero in some cases. Added new functions
  my_print_help() and my_print_variables() to be used by mysql server
  and most clients.

sql/opt_sum.cc:
  Auto merged

BitKeeper/deleted/.del-README~877d76bcd19f7193:
  Delete: mysql-test/xml/README
BitKeeper/deleted/.del-sel000001.xml~f0eb64c0346366db:
  Delete: mysql-test/xml/tests/sel000001.xml
BitKeeper/deleted/.del-sel000002.xml~8cd06da5293a7147:
  Delete: mysql-test/xml/tests/sel000002.xml
BitKeeper/deleted/.del-sel000003.xml~1a622b8d30d7ade8:
  Delete: mysql-test/xml/tests/sel000003.xml
BitKeeper/deleted/.del-sel000004.xml~515488ef221523d9:
  Delete: mysql-test/xml/tests/sel000004.xml
BitKeeper/deleted/.del-sel000005.xml~a6344e46ba572dc3:
  Delete: mysql-test/xml/tests/sel000005.xml
BitKeeper/deleted/.del-sel000006.xml~8ad8f44f49b21246:
  Delete: mysql-test/xml/tests/sel000006.xml
BitKeeper/deleted/.del-sel000007.xml~bfcb6d85276be7e8:
  Delete: mysql-test/xml/tests/sel000007.xml
BitKeeper/deleted/.del-sel000008.xml~1d6082f0905c51b6:
  Delete: mysql-test/xml/tests/sel000008.xml
BitKeeper/deleted/.del-sel000009.xml~8677613dc624cb0c:
  Delete: mysql-test/xml/tests/sel000009.xml
BitKeeper/deleted/.del-sel000010.xml~9b98c9cce8fac145:
  Delete: mysql-test/xml/tests/sel000010.xml
BitKeeper/deleted/.del-sel000011.xml~432156d127cbd22f:
  Delete: mysql-test/xml/tests/sel000011.xml
BitKeeper/deleted/.del-sel000012.xml~a410d08dc4cfee11:
  Delete: mysql-test/xml/tests/sel000012.xml
BitKeeper/deleted/.del-sel000013.xml~2717cbfbe5730174:
  Delete: mysql-test/xml/tests/sel000013.xml
BitKeeper/deleted/.del-sel000014.xml~bcf55df6a036bd8f:
  Delete: mysql-test/xml/tests/sel000014.xml
BitKeeper/deleted/.del-sel000015.xml~b72689a8f9b21372:
  Delete: mysql-test/xml/tests/sel000015.xml
BitKeeper/deleted/.del-sel000016.xml~32f1ef2e3d214be0:
  Delete: mysql-test/xml/tests/sel000016.xml
BitKeeper/deleted/.del-sel000017.xml~81423597605ff77f:
  Delete: mysql-test/xml/tests/sel000017.xml
BitKeeper/deleted/.del-sel000018.xml~82e2e7bde83f56d8:
  Delete: mysql-test/xml/tests/sel000018.xml
BitKeeper/deleted/.del-sel000019.xml~c0f0b05e481b90e7:
  Delete: mysql-test/xml/tests/sel000019.xml
BitKeeper/deleted/.del-sel000020.xml~8849bbf91a4fd5ec:
  Delete: mysql-test/xml/tests/sel000020.xml
BitKeeper/deleted/.del-sel000021.xml~2763b87c1549ba87:
  Delete: mysql-test/xml/tests/sel000021.xml
BitKeeper/deleted/.del-sel000022.xml~da2083ef423ae39a:
  Delete: mysql-test/xml/tests/sel000022.xml
BitKeeper/deleted/.del-sel000023.xml~11993b379b9838be:
  Delete: mysql-test/xml/tests/sel000023.xml
BitKeeper/deleted/.del-sel000024.xml~dd067aa28220fa4c:
  Delete: mysql-test/xml/tests/sel000024.xml
BitKeeper/deleted/.del-sel000025.xml~3e766aa1e43b303:
  Delete: mysql-test/xml/tests/sel000025.xml
BitKeeper/deleted/.del-sel000026.xml~15145e496417646f:
  Delete: mysql-test/xml/tests/sel000026.xml
BitKeeper/deleted/.del-README~cd4bb681e5a0cd10:
  Delete: mysql-test/xml/xsl/README
BitKeeper/deleted/.del-sel000027.xml~95e7de3e9934b570:
  Delete: mysql-test/xml/tests/sel000027.xml
BitKeeper/deleted/.del-sel000028.xml~c72bfec6600949b:
  Delete: mysql-test/xml/tests/sel000028.xml
BitKeeper/deleted/.del-sel000029.xml~3aba1eb23ef86c9e:
  Delete: mysql-test/xml/tests/sel000029.xml
BitKeeper/deleted/.del-sel000030.xml~c2b25781eefaee9:
  Delete: mysql-test/xml/tests/sel000030.xml
BitKeeper/deleted/.del-mysqltest.xsl~1b8f6ec4f1b5f634:
  Delete: mysql-test/xml/xsl/mysqltest.xsl
sql/opt_sum.cc:
  Fixed typo

  Updated general manual about InnoDB locking and CHECK TABLE


Docs/manual.texi:
  Updated general manual about InnoDB locking and CHECK TABLE

  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock


sql/ha_innobase.cc:
  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock

  Small improvements
row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
ha_innobase.cc:
  Some fine-tuning of optimization


sql/ha_innobase.cc:
  Some fine-tuning of optimization
innobase/include/log0recv.h:
  Small improvements
innobase/include/mem0mem.h:
  Small improvements
innobase/include/mem0pool.h:
  Small improvements
innobase/include/row0mysql.h:
  Small improvements
innobase/include/srv0srv.h:
  Small improvements
innobase/include/trx0trx.h:
  Small improvements
innobase/buf/buf0lru.c:
  Small improvements
innobase/fil/fil0fil.c:
  Small improvements
innobase/log/log0recv.c:
  Small improvements
innobase/mem/mem0mem.c:
  Small improvements
innobase/mem/mem0pool.c:
  Small improvements
innobase/row/row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
innobase/srv/srv0srv.c:
  Small improvements
innobase/srv/srv0start.c:
  Small improvements
innobase/trx/trx0purge.c:
  Small improvements
innobase/trx/trx0trx.c:
  Small improvements