Docs/Support/docbook-fixup.pl:
  Added new regex for XREFs, to have them in correct English-grammar.
  Minor fixup to removed node catcher from earlier change.
Docs/manual.texi:
  Fixup of Texinfo @ref/@xref/@pxref usage in appropriate locations.

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

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

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

Fixed typo.

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

Added update about PostgreSQL 7.2 and VACUUM.

into linux.local:/home/zak/bk/mysql-4.0

  Fix typo in a contrib download filename


Docs/manual.texi:
  Fix typo in a contrib download filename

into sarvik.tfr.cafe.ee:/usr/home/tfr/BK/mysql-4.0


Docs/manual.texi:
  Auto merged

Docs/Support/docbook-fixup.pl:
  Series of minor changes to convert the output of makeinfo to well-formed XML
   - Discarded DTD - ORA can add their own appropriate DTD
   - Added required XML PI - included appropriate character encoding information
   - Added missing abstract and bookinfo tags
   - Escaped ampersands in HTML escape sequences to allow validation - need to review
Docs/Support/make-docbook:
  Forced validation of XML document at end of conversion process
  Removed temporary files - set makeinfo output to stdout
BitKeeper/etc/ignore:
  Added Docs/safe-mysql.xml to the ignore list
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Remove link to sqlscreens in the contrib section


Docs/manual.texi:
  Remove link to sqlscreens in the contrib section

Docs/manual.texi:
  All lines in @example blocks need to be <76 chars.
  Minor cleanup of other stuff in @example blocks.

Added mention of USE/IGNORE KEY as alias for USE/IGNORE INDEX.
Fixups references to this feature throughout manual.

Docs/manual.texi:
  Added USE INDEX / IGNORE INDEX syntax to table_references info in SELECT.
  Added USE INDEX / IGNORE INDEX to function index.

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