BitKeeper/triggers/post-commit:
  Added List-ID: header for easier filtering.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

innobase/btr/btr0btr.c:
  Testing bitkeeper
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


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

Added test for ALTER TABLE ORDER BY


BUILD/FINISH.sh:
  Fixes for innobase
BUILD/compile-pentium-debug:
  Fixes for innobase
Docs/manual.texi:
  Fixes for innobase
include/my_pthread.h:
  Fixes for innobase
innobase/Makefile.am:
  Fixes for innobase
innobase/btr/Makefile.am:
  Fixes for innobase
innobase/data/Makefile.am:
  Fixes for innobase
innobase/eval/Makefile.am:
  Fixes for innobase
innobase/include/Makefile.i:
  Fixes for innobase
innobase/os/Makefile.am:
  Fixes for innobase
mysql-test/t/alter_table.test:
  Added test for ALTER TABLE ORDER BY
mysys/my_error.c:
  Skip 'l' in '%lu'
mysys/my_vsnprintf.c:
  cleanup
sql/ha_innobase.cc:
  Fixed type + remove warnings
sql/ha_innobase.h:
  Remove warnings
sql/handler.cc:
  cleanup
sql/sql_class.cc:
  remove warnings
sql/sql_parse.cc:
  remove warnings
sql/sql_table.cc:
  Fixed bug in ALTER TABLE ... ORDER BY
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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


sql/mysqld.cc:
  Auto merged

into donna.mysql.com:/home/tim/my/work


innobase/os/os0sync.c:
  Auto merged

BUILD/compile-pentium-debug:
  Added --with-innobase
Docs/manual.texi:
  Added documentation for -O max_user_connections
innobase/os/os0sync.c:
  Fix for Heikki

into donna.mysql.com:/home/tim/my/work


innobase/configure.in:
  Auto merged
innobase/include/lock0types.h:
  Auto merged
innobase/include/os0sync.h:
  Auto merged
innobase/include/sync0types.h:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Fixes for Innobase
Don't reset whole to-buffer in strxnmov


BUILD/compile-pentium-debug:
  Added innobase
include/mysqld_error.h:
  New error messages
innobase/configure.in:
  Update from heikki
innobase/include/lock0types.h:
  Update from heikki
innobase/include/os0sync.h:
  Update from heikki
innobase/include/sync0types.h:
  Update from heikki
innobase/os/os0file.c:
  Update from heikki
innobase/srv/srv0start.c:
  Update from heikki
sql/ha_innobase.cc:
  Update from Heikki
  Changed assert -> dbug_assert
  Changed return -> DBUG_RETURN
sql/mysql_priv.h:
  Added max_user_connections
sql/mysqld.cc:
  Added max_user_connections
sql/share/czech/errmsg.txt:
  Added max_user_connections
sql/share/danish/errmsg.txt:
  Added max_user_connections
sql/share/dutch/errmsg.txt:
  Added max_user_connections
sql/share/english/errmsg.txt:
  Added max_user_connections
sql/share/estonian/errmsg.txt:
  Added max_user_connections
sql/share/french/errmsg.txt:
  Added max_user_connections
sql/share/german/errmsg.txt:
  Added max_user_connections
sql/share/greek/errmsg.txt:
  Added max_user_connections
sql/share/hungarian/errmsg.txt:
  Added max_user_connections
sql/share/italian/errmsg.txt:
  Added max_user_connections
sql/share/japanese/errmsg.txt:
  Added max_user_connections
sql/share/korean/errmsg.txt:
  Added max_user_connections
sql/share/norwegian-ny/errmsg.txt:
  Added max_user_connections
sql/share/norwegian/errmsg.txt:
  Added max_user_connections
sql/share/polish/errmsg.txt:
  Added max_user_connections
sql/share/portuguese/errmsg.txt:
  Added max_user_connections
sql/share/romanian/errmsg.txt:
  Added max_user_connections
sql/share/russian/errmsg.txt:
  Added max_user_connections
sql/share/slovak/errmsg.txt:
  Added max_user_connections
sql/share/spanish/errmsg.txt:
  Added max_user_connections
sql/share/swedish/errmsg.OLD:
  Added max_user_connections
sql/share/swedish/errmsg.txt:
  Added max_user_connections
sql/sql_class.h:
  cleanup
strings/str_test.c:
  Added tests for strxnmov
strings/strxnmov.c:
  Don't reset whole to buffer

Docs/manual.texi:
  updates from Matthias Urlichs
mysql-test/r/rpl000016.result:
  position sanity check - hope to catch the timing bug
mysql-test/t/rpl000016.test:
  position sanity check - hope to catch timing bug
sql/log_event.cc:
  limit event length by max_allowed_packet
sql/log_event.h:
  abolish MAX_EVENT_LEN
sql/sql_repl.cc:
  error for events larger than max_allowed_packet

Add --with-innobase-db to configure.


acconfig.h:
  HAVE_INNOBASE_DB
acinclude.m4:
  add MYSQL_CHECK_INNOBASE
configure.in:
  use MYSQL_CHECK_INNOBASE and configure innobase directory
innobase/configure.in:
  add AM_MAINTAINER_MODE
innobase/include/lock0types.h:
  define lock_t
innobase/include/os0file.h:
  define S_IRWX[UGO] if needed
innobase/include/os0sync.h:
  use pthread_cond_t instead of mutex
innobase/include/sync0types.h:
  define mutex_t
innobase/os/os0sync.c:
  use pthread_cond_t instead of mutex
sql/Makefile.am:
  add @innobase_{includes,libs}@
sql/ha_innobase.cc:
  fix casts

Docs/manual.texi:
  Applied patch from David Carlson for Windows_and_SSH section.

Docs/manual.texi:
  Typo clean-ups.

Docs/manual.texi:
  Added missing @strong{}.

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

Docs/manual.texi:
  Fixed typo

Docs/manual.texi:
  Changed code{MySQL} -> strong{MySQL}

Fix for BSDI 4.0


Docs/manual.texi:
  Added MySQL AB information
configure.in:
  Fix for BSDI 4.0
myisam/mi_rprev.c:
  Fixed problem with concurrent inserts and read-previous
mysys/mf_format.c:
  Fix for BSDI 4.0
sql/handler.cc:
  Fixed type

Fixed typo when removing space from argument to -O


Docs/manual.texi:
  Update of merge tables
myisam/mi_check.c:
  Moved test of FULLTEXT keys to make things more efficient
myisam/myisamchk.c:
  Incremented version
myisam/myisamdef.h:
  Fixed that myisamchk -R works on text columns
mysys/getvar.c:
  Fixed typo when removing space from argument to -O

sql/ha_innobase.cc:
  Removed some whitespace

Fixed mutex problem when doing automatic repair of MyISAM tables


Docs/manual.texi:
  changelog
include/thr_lock.h:
  Added TL_READ_WITH_SHARED_LOCKS for Innobase
mysql-test/r/update.result:
  Added 'select' to verify update results
mysql-test/t/update.test:
  Better code coverage
mysys/getvar.c:
  Allow space in to --set-variable
mysys/thr_lock.c:
  Added TL_READ_WITH_SHARED_LOCKS
sql/ha_myisam.cc:
  Added comment
sql/lock.cc:
  Added missing broadcast
sql/sql_base.cc:
  Fixed some mutex problem when doing automatic repair of MyISAM tables
sql/sql_update.cc:
  Purecoverage

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