Docs/manual.texi:
  Clearify when logging is done
myisam/myisamchk.c:
  Better error message
mysql-test/r/merge.result:
  Added test for SHOW CREATE on MERGE table
scripts/safe_mysqld.sh:
  Search by default in database directory
sql/ha_myisammrg.h:
  Add UNION() to SHOW CREATE TABLE
sql/sql_update.cc:
  removed compiler warning

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Added Innobase documentation
configure.in:
  Incremented version
include/my_base.h:
  Added option for Innobase
myisam/mi_check.c:
  cleanup
mysql-test/t/bdb.test:
  cleanup
mysql-test/t/innobase.test:
  Extended with new tests from bdb.test
mysql-test/t/merge.test:
  Added test of SHOW create
mysys/my_init.c:
  Fix for UNIXWARE 7
scripts/mysql_install_db.sh:
  Always write how to start mysqld
scripts/safe_mysqld.sh:
  Fixed type
sql/ha_innobase.cc:
  Update to new version
sql/ha_innobase.h:
  Update to new version
sql/handler.h:
  Added 'update_table_comment()' and 'append_create_info()'
sql/sql_delete.cc:
  Fixes for Innobase
sql/sql_select.cc:
  Fixes for Innobase
sql/sql_show.cc:
  Append create information (for MERGE tables)
sql/sql_update.cc:
  Fixes for Innobase

into tetra.spaceapes.com:/usr/home/jcole/bk/mysql


BitKeeper/etc/logging_ok:
  auto-union
sql/sql_parse.cc:
  Auto merged

to the slow query log.


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

acinclude.m4:
  - only allow berkeley db versions 3.2.3h and 3.2.9a
configure.in:
  - update how the BDB Makefile is modified

Docs/manual.texi:
  - undocument nonexistent functions (mysql_{start,stop}_slave)

Removed a ' that casued 'make paper' to fail


Docs/manual.texi:
  Updated myisamchk section;  Removed a ' that casued 'make paper' to fail
sql/handler.cc:
  Updates for innobase
sql/mysqld.cc:
  Updates for innobase
sql/sql_parse.cc:
  Fixed possible overrun if the mysqld server name is too big
sql/sql_select.cc:
  Updates for innobase

into mysql.sashanet.com:/home/sasha/src/bk/mysql


sql/slave.cc:
  Auto merged

mysql-test/r/rpl000002.result:
  test timestamp replication
mysql-test/t/rpl000002.test:
  test timestamp replication

Docs/manual.texi:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/slave.cc:
  Auto merged

Changed errmsg -> my_errmsg (portability issue)
Fixed that mysqlbinlog writes SET TIMESTAMP before all queries
Fixed comments in default my.cnf files


Docs/manual.texi:
  Updated information about character sets
client/mysqladmin.c:
  Added missing help text
client/mysqltest.c:
  Changed --replace to --replace_result to not conflict with SQL replace command
include/my_sys.h:
  change errmsg -> my_errmsg (portability issue)
libmysql/errmsg.c:
  change errmsg -> my_errmsg (portability issue)
myisam/mi_cache.c:
  Changed seek+read to pread
myisam/mi_check.c:
  Fix bug that caused myisamchk to be very slow under some specific error conditions
myisam/mi_dynrec.c:
  cleanup
myisam/myisamchk.c:
  Write out value of checksum
myisam/myisamdef.h:
  cleanup
mysql-test/r/backup.result:
  Fixed the case where backup caused different error messages
mysql-test/r/bdb.result:
  Added new test case
mysql-test/r/fulltext.result:
  Fix for new CREATE TABLE format
mysql-test/t/backup.test:
  Use --replace_result and --send
mysql-test/t/bdb.test:
  New test case
mysql-test/t/status.test:
  Use --send
mysys/errors.c:
  change errmsg -> my_errmsg (portability issue)
mysys/my_error.c:
  change errmsg -> my_errmsg (portability issue)
mysys/typelib.c:
  Only accept full type names
sql/derror.cc:
  change errmsg -> my_errmsg (portability issue)
sql/ha_berkeley.cc:
  Fixed bug when using key parts that could be NULL
sql/log_event.cc:
  Log SET TIMESTAMP before all queries
sql/mysqlbinlog.cc:
  Incremented version number
sql/mysqld.cc:
  change errmsg -> my_errmsg (portability issue)
  Always accept --skip-gemeni, --skip-bdb and --skip-innobase
sql/slave.cc:
  cleanup
sql/sql_base.cc:
  cleanup
sql/sql_db.cc:
  cleanup
support-files/my-huge.cnf.sh:
  Remove usage of # at end of line
support-files/my-large.cnf.sh:
  Remove usage of # at end of line
support-files/my-medium.cnf.sh:
  Remove usage of # at end of line
support-files/my-small.cnf.sh:
  Remove usage of # at end of line

Build-tools/Do-compile:
  monty's uncommitted stuff

    after Indrek's bugfix in show create table, the result has two extra spaces


mysql-test/r/fulltext.result:
  after Indrek's bugfix in show create table, the result has two extra spaces

    fixed skipping bug in bi-directional replication


sql/slave.cc:
  fixed skipping bug in bi-directional replication

Docs/manual.texi:
  Added FTP mirror in Japan.

Docs/manual.texi:
  Auto merged

Fixed that GROUP BY can take DESC


Docs/manual.texi:
  Cleanups
client/mysqltest.c:
  Added --replace to mysqltest
mysql-test/t/backup.test:
  Fix to handle different error codes from backup table
sql-bench/crash-me.sh:
  Fixed error in create_index test
sql/item_func.cc:
  Cleanup
sql/sql_yacc.yy:
  Fixed that GROUP BY can take DESC

BitKeeper/etc/logging_ok:
  Fixed logging after tfr.

BitKeeper/etc/logging_ok:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql_show.cc	Fix to add space in SHOW CREATE TABLE between index name and column definitions


sql/sql_show.cc:
  Fix to add space in SHOW CREATE TABLE between index name and column definitions
client/mysqldump.c:
  Fix to add space between index name and column definition in CREATE TABLE statement

Docs/manual.texi:
  Typo fix.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysys/my_bitmap.c:
  Clear bitmap array

into threads.polyesthetic.msg:/usr/local/src/my/work

Docs/manual.texi:
  Changelog

reading while the table was being backed up.


sql/sql_table.cc:
  open_for_modify should be FALSE in mysql_backup_table

Changed BITMAP to MY_BITMAP to avoid type conflict on windows


configure.in:
  Force sockets to be blocking on HPUX 11.0
include/my_bitmap.h:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_bitmap.c:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
mysys/my_init.c:
  Removed LOCK_bitmap
sql/mysql_priv.h:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/mysqld.cc:
  Changed BITMAP to MY_BITMAP to avoid type conflict on windows
sql/violite.c:
  Force sockets to be blocking on HPUX 11.0

Patches for Armstrong
Removed warnings when using REPAIR TABLE .. EXTENDED


Docs/manual.texi:
  Changelog
configure.in:
  Added missing -lsocket library on SCO
include/global.h:
  Patch for Armstrong
include/my_bitmap.h:
  Changed bitmap interface to avoid problem with missing LOCK_bitmap symbol
include/myisampack.h:
  Portability fix for Armstrong
mysql-test/t/select.test:
  Changed to work with 'mysql test < select.tst'
mysys/my_bitmap.c:
  Changed bitmap interface to avoid problem with missing LOCK_bitmap symbol
mysys/my_init.c:
  Removed LOCK_bitmap
sql/field.cc:
  Patch for Armstrong
sql/filesort.cc:
  Patch for Armstrong
sql/ha_myisam.cc:
  Removed warnings when using REPAIR TABLE .. EXTENDED
sql/mysql_priv.h:
  Use new bitmap interface
sql/mysqld.cc:
  Use new bitmap interface
sql/sql_select.cc:
  Use new bitmap interface

Docs/manual.texi:
  Updated MyODBC installation
sql/share/Makefile.am:
  Fixed typo

README:
  Cleanup
sql-bench/Makefile.am:
  Remove deleted directory
sql/mysqlbinlog.cc:
  Cleanup --help

Docs/manual.texi:
  Added link
sql/share/Makefile.am:
  Fixed typo