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

Docs/manual.texi:
  Cleanups

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


BitKeeper/etc/logging_ok:
  auto-union

SET @foo=bar;

This would cause a deadlock in mysqld, it now generates the error:
ER_SET_CONSTANTS_ONLY as follows:

mysql> set @foo=bar;
ERROR 1204: You may only use constant expressions with SET


include/mysqld_error.h:
  Added a new error message for SET
sql/share/czech/errmsg.txt:
  Added a new error message for SET
sql/share/danish/errmsg.txt:
  Added a new error message for SET
sql/share/dutch/errmsg.txt:
  Added a new error message for SET
sql/share/english/errmsg.txt:
  Added a new error message for SET
sql/share/estonian/errmsg.txt:
  Added a new error message for SET
sql/share/french/errmsg.txt:
  Added a new error message for SET
sql/share/german/errmsg.txt:
  Added a new error message for SET
sql/share/greek/errmsg.txt:
  Added a new error message for SET
sql/share/hungarian/errmsg.txt:
  Added a new error message for SET
sql/share/italian/errmsg.txt:
  Added a new error message for SET
sql/share/japanese/errmsg.txt:
  Added a new error message for SET
sql/share/korean/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian-ny/errmsg.txt:
  Added a new error message for SET
sql/share/norwegian/errmsg.txt:
  Added a new error message for SET
sql/share/polish/errmsg.txt:
  Added a new error message for SET
sql/share/portuguese/errmsg.txt:
  Added a new error message for SET
sql/share/romanian/errmsg.txt:
  Added a new error message for SET
sql/share/russian/errmsg.txt:
  Added a new error message for SET
sql/share/slovak/errmsg.txt:
  Added a new error message for SET
sql/share/spanish/errmsg.txt:
  Added a new error message for SET
sql/share/swedish/errmsg.txt:
  Added a new error message for SET
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Docs/manual.texi:
  ``short'' TIME values issue clarified

Docs/manual.texi:
  Auto merged
mysql-test/t/fulltext.test:
  merged

    make sure we get correct data 


mysql-test/t/bdb-crash.test:
  make sure we get correct data

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

mysql-test/t/bdb.test:
  added space
mysql-test/t/fulltext.test:
  comment out the test for the last bug until Serg pushes the change
sql/field.cc:
  fixed coredump in INSERT into BDB table

sql/ha_innobase.cc:
  Fixed a bug in ha_innobase.cc in auto_increment

Docs/manual.texi:
  Mirror maintenance.

test-make-manual	Fixed so that manual.html isn't cleaned up before it is viewed in the running $BROWSER.
manual.texi	Added MyODBC patch to contrib section.


Docs/manual.texi:
  Added MyODBC patch to contrib section.
Docs/Support/test-make-manual:
  Fixed so that manual.html isn't cleaned up before it is viewed in the running $BROWSER.

innobase/include/os0file.h:
  Removed a typo in os0file.h

item_func.cc	MATCH ... AGAINST (NULL) bug fixed
fulltext.test	MATCH ... AGAINST (NULL) bug fixed
fulltext.result	MATCH ... AGAINST (NULL) bug fixed


mysql-test/r/fulltext.result:
  MATCH ... AGAINST (NULL) bug fixed
mysql-test/t/fulltext.test:
  MATCH ... AGAINST (NULL) bug fixed
sql/item_func.cc:
  MATCH ... AGAINST (NULL) bug fixed
sql/sql_select.cc:
  MATCH ... AGAINST (NULL) bug fixed

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

    added a test case for a coredump bug.


mysql-test/t/fulltext.test:
  added a test case for a coredump bug.

    update for the fix
sql/slave.cc
    re-merged Jeremy's message changes, got the code to compile and run again
    after a mess-up in the merge


Docs/manual.texi:
  update for the fix
sql/slave.cc:
  re-merged Jeremy's message changes, got the code to compile and run again
  after a mess-up in the merge

    merged


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

more verbose messages when slave thread exits


sql/slave.cc:
  ulonglong -> uint32 for log offset
sql/slave.h:
  ulonglong -> uint32 for log offset

Docs/manual.texi:
  fixed chown issue

os0file.h	Added defines for S_IRUSR etc.


innobase/include/os0file.h:
  Added defines fro S_IRUSR etc.
innobase/os/os0file.c:
  Removed execute rights from created files

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

into donna.mysql.fi:/home/heikki/mysql


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

sql/ha_innobase.cc:
  Fix autocommit in ha_innobase.cc

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.