Docs/Support/docbook-fixup.pl:
  Added fixup for xref closing /> tag to prevent malformed XML.
  Improved /para whitespace removal.
Docs/manual.texi:
  Removed double whitespace in middle of sentence.

sql/sql_parse.cc:
  Auto merged

Docs/manual.texi:
  Added section about LOAD DATA LOCAL
libmysqld/lib_sql.cc:
  Remove not used option
mysql-test/r/comments.result:
  Updated results
sql/sql_parse.cc:
  Fix queries / second

Build-tools/Do-compile:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged

BitKeeper/etc/logging_ok:
  auto-union
acconfig.h:
  Auto merged
Docs/manual.texi:
  Auto merged
client/client_priv.h:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
mysql-test/t/comments.test:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/unireg.cc:
  Auto merged
sql/unireg.h:
  Auto merged

configure.in:
  Fix for gethostbyname_r (for solaris)
mysql-test/r/innodb.result:
  Fix innodb results
sql/mysql_priv.h:
  Added OPTION_FOUND_COMMENTS

  Add a warning to drop database wait if there are still open handles on a table


innobase/row/row0mysql.c:
  Add a warning to drop database wait if there are still open handles on a table

  Add some more safety if MySQL tries to drop a table on which there are open handles


sql/ha_innobase.cc:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/row/row0mysql.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/dict/dict0dict.c:
  Add some more safety if MySQL tries to drop a table on which there are open handles
innobase/include/dict0dict.h:
  Add some more safety if MySQL tries to drop a table on which there are open handles

  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop


sql/sql_db.cc:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop
innobase/row/row0mysql.c:
  Try to make sure DROP DATABASE does not cause a deadlock because we now let InnoDB wait MySQL does not have open handles to tables we drop

  DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database


sql/ha_innobase.cc:
  DROP DATABASE required that the database name is in lower case to work; put it always to lower case in innobase_drop_database
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fix for ctypes on windows
Cleanup max_queries_per_hour


mysql-test/t/dirty_close.test:
  Rename: mysql-test/t/dirty-close.test -> mysql-test/t/dirty_close.test
mysql-test/r/dirty_close.result:
  Rename: mysql-test/r/dirty-close.result -> mysql-test/r/dirty_close.result
Docs/manual.texi:
  Added --user=userid
include/m_ctype.h:
  Fix for ctypes on windows
mysql-test/r/join.result:
  Update join results
sql/mysqld.cc:
  Added --user=userid
sql/sql_parse.cc:
  Cleanup max_queries_per_hour

sql/unireg.cc:
  Use NAMES_SEP_CHAR also for enums
sql/unireg.h:
  cleanup

BitKeeper/etc/logging_ok:
  auto-union

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Changelog
sql/sql_yacc.yy:
  optimization
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Changed C++ style comments to ANSI C style.


client/mysqldump.c:
  Changed C++ style comments to ANSI C style.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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'