sql/sql_base.cc:
  merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  Changed name mysql_multi_mysqld to mysqld_multi.
  This is because safe_mysqld will be converted to mysqld_safe
  in the future and the new name is shorter than the old one.
scripts/Makefile.am:
  Added mysqld_multi
scripts/mysqld_multi.sh:
  Changed name from mysql_multi_mysqld to mysqld_multi

myrg_info.c	merge+insert (alternate take)
myrg_extra.c	merge+insert (alternate take)
mymrgdef.h	merge+insert (alternate take)
sql_base.cc	open_table --> open_or_reset_table (needed for MERGE)


sql/sql_base.cc:
  open_table --> open_or_reset_table (needed for MERGE)
myisammrg/mymrgdef.h:
  merge+insert (alternate take)
myisammrg/myrg_extra.c:
  merge+insert (alternate take)
myisammrg/myrg_info.c:
  merge+insert (alternate take)
myisammrg/myrg_rrnd.c:
  merge+insert (alternate take)

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

Docs/manual.texi:
  Updated nodes
sql/ha_berkeley.cc:
  Don't count deletes

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

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Docs/manual.texi:
  Bug fix with HEAP type tables.

A lot of new functions for BDB tables
Fix for DROP DATABASE on windows
Default server_id variables


Docs/manual.texi:
  Update of BDB info + Changes
configure.in:
  Added test of readlink
include/mysqld_error.h:
  Added new error message
sql/ha_berkeley.cc:
  Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
sql/ha_berkeley.h:
  Added storing of status, CHECK, ANALYZE and OPTIMIZE TABLE
sql/handler.cc:
  Only write full transactions to binary log
sql/hostname.cc:
  cleanup
sql/log.cc:
  Only write full transactions to binary log
sql/log_event.h:
  Only write full transactions to binary log
sql/mf_iocache.cc:
  Changes to be able to use IO_CACHE to save statements in a transaction
sql/mysql_priv.h:
  New variables
sql/mysqld.cc:
  Only write full transactions to binary log
  Added default values for server_id
  Lots of new bdb options
sql/share/czech/errmsg.sys:
  Added new error message
sql/share/czech/errmsg.txt:
  Added new error message
sql/share/danish/errmsg.sys:
  Added new error message
sql/share/danish/errmsg.txt:
  Added new error message
sql/share/dutch/errmsg.sys:
  Added new error message
sql/share/dutch/errmsg.txt:
  Added new error message
sql/share/english/errmsg.sys:
  Added new error message
sql/share/english/errmsg.txt:
  Added new error message
sql/share/estonian/errmsg.sys:
  Added new error message
sql/share/estonian/errmsg.txt:
  Added new error message
sql/share/french/errmsg.sys:
  Added new error message
sql/share/french/errmsg.txt:
  Added new error message
sql/share/german/errmsg.sys:
  Added new error message
sql/share/german/errmsg.txt:
  Added new error message
sql/share/greek/errmsg.sys:
  Added new error message
sql/share/greek/errmsg.txt:
  Added new error message
sql/share/hungarian/errmsg.sys:
  Added new error message
sql/share/hungarian/errmsg.txt:
  Added new error message
sql/share/italian/errmsg.sys:
  Added new error message
sql/share/italian/errmsg.txt:
  Added new error message
sql/share/japanese/errmsg.sys:
  Added new error message
sql/share/japanese/errmsg.txt:
  Added new error message
sql/share/korean/errmsg.sys:
  Added new error message
sql/share/korean/errmsg.txt:
  Added new error message
sql/share/norwegian-ny/errmsg.txt:
  Added new error message
sql/share/norwegian/errmsg.txt:
  Added new error message
sql/share/polish/errmsg.sys:
  Added new error message
sql/share/polish/errmsg.txt:
  Added new error message
sql/share/portuguese/errmsg.sys:
  Added new error message
sql/share/portuguese/errmsg.txt:
  Added new error message
sql/share/romanian/errmsg.txt:
  Added new error message
sql/share/russian/errmsg.sys:
  Added new error message
sql/share/russian/errmsg.txt:
  Added new error message
sql/share/slovak/errmsg.sys:
  Added new error message
sql/share/slovak/errmsg.txt:
  Added new error message
sql/share/spanish/errmsg.sys:
  Added new error message
sql/share/spanish/errmsg.txt:
  Added new error message
sql/share/swedish/errmsg.OLD:
  Added new error message
sql/share/swedish/errmsg.sys:
  Added new error message
sql/share/swedish/errmsg.txt:
  Added new error message
sql/sql_base.cc:
  cleanup
sql/sql_class.cc:
  Only write full transactions to binary log
sql/sql_class.h:
  Added error handling of failed writes to logs
sql/sql_db.cc:
  Fix for DROP DATABASE on windows
sql/sql_delete.cc:
  Only write full transactions to binary log
sql/sql_insert.cc:
  Only write full transactions to binary log
sql/sql_load.cc:
  Only write full transactions to binary log
sql/sql_parse.cc:
  End transaction at DROP, RENAME, CREATE and TRUNCATE
sql/sql_table.cc:
  Fixes for ALTER TABLE on BDB tables for windows
sql/sql_update.cc:
  Only write full transactions to binary log
sql/sql_yacc.yy:
  AGAINST is not anymore a reserved word
support-files/my-huge.cnf.sh:
  Changed to use binary log
support-files/my-large.cnf.sh:
  Changed to use binary log
support-files/my-medium.cnf.sh:
  Changed to use binary log
support-files/my-small.cnf.sh:
  Changed to use binary log

Docs/manual.texi:
  Added documentation about new client, mysql_multi_mysqld.
  This program is meant for managing multiple MySQL servers.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

myrg_info.c	merge + insert OK
mymrgdef.h	merge + insert OK
mrg000001.test  test for the above
mysql-test-run	compatibility (FreeBSD) changes from mysql-4.0 backpropagated


mysql-test/mysql-test-run:
  compatibility (FreeBSD) changes from mysql-4.0 backpropagated
myisammrg/mymrgdef.h:
  merge + insert OK
myisammrg/myrg_info.c:
  merge + insert OK
myisammrg/myrg_rrnd.c:
  merge + insert OK

Docs/manual.texi:
  cleanups for recent change notes.

BitKeeper/etc/logging_ok:
  auto-union

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


BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  A few grammatical changes.

BitKeeper/etc/logging_ok:
  Auto converge
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
client/mysql.cc:
  Added optional argument to --i-am-a-dummy
sql/handler.cc:
  Fix for innobase
sql/handler.h:
  Fix for innobase
sql/sql_class.cc:
  Fix for innobase
sql/sql_db.cc:
  Fixed that DROP DATABASE works on OS/2

Docs/manual.texi:
  merged

Change that handler gets file names in native format


Docs/manual.texi:
  Small bug fix
sql/Makefile.am:
  Added innobase handler files
sql/mysqld.cc:
  Added startup options for innobase
sql/sql_table.cc:
  Change that handler gets file names in native format

BitKeeper/etc/ignore:
  Added mysql-test/var/lib/mysql-bin.008 to the ignore list
mysql-test/r/3.23/sel000100.result:
  coredump fixed, now it makes sense to have something in the result file
mysql-test/t/3.23/sel000100.test:
  renamed result file

Docs/manual.texi:
  fixed typo
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

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

Docs/manual.texi:
  Changlog
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

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

BitKeeper/etc/ignore:
  Added mysql-test/var/lib/test/test1.frm mysql-test/var/lib/test/test1.MYD mysql-test/var/lib/test/test1.MYI mysql-test/var/lib/test/test2.frm mysql-test/var/lib/test/test2.MYD mysql-test/var/lib/test/test2.MYI mysql-test/var/run/mysqld.pid mysql-test/var/tmp/mysql.sock to the ignore list

Docs/manual.texi:
  merged

Docs/manual.texi:
  "fine-tuning" section added to fulltext manual

Docs/manual.texi:
  Added a mirror in Italy and China.

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***

Fix for creating read-only files on windows
Manual updates


BitKeeper/deleted/.del-acconfig.h~65f1202b3b5c345f:
  ***MISSING WEAVE***
BitKeeper/deleted/.del-acconfig.h~7b620dbd69ea6074:
  ***MISSING WEAVE***
Docs/manual.texi:
  Small clarifications
BitKeeper/etc/ignore:
  Added Docs/manual.aux Docs/manual.cp Docs/manual.cps Docs/manual.dvi Docs/manual.fn Docs/manual.fns Docs/manual.ky Docs/manual.pg Docs/manual.toc Docs/manual.tp Docs/manual.vr Docs/manual_a4.ps Docs/manual_letter.ps to the ignore list
mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
mysys/my_open.c:
  Fix for windows where some files where created read only
sql/ha_myisam.cc:
  Added 'checking table' to process-list status
sql/opt_range.cc:
  Cleanup
sql/share/czech/errmsg.sys:
  New error messages
sql/share/czech/errmsg.txt:
  New error messages
sql/share/italian/errmsg.sys:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages

logging_ok	Logging to logging@openlogging.org accepted


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
Docs/manual.texi:
  fixed couple of list items in description of mysql options

BitKeeper/etc/ignore:
  auto-union
Docs/manual.texi:
  Auto merged
sql/opt_range.cc:
  SCCS merged

BitKeeper/etc/ignore:
  added PENDING/*

BitKeeper/etc/ignore:
  Added libmysql_r/ctype_extra_sources.c libmysql_r/conf_to_src libmysql_r/.libs/libmysqlclient_r.lai to the ignore list

mysql-test/chew_on_this/select.res:
  ***MISSING WEAVE***
Docs/manual.texi:
  Clarifications
sql/opt_range.cc:
  Removed comment from critical code

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