mysql-test/r/myisam.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-limit-4.0

into sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0

  Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified


sql/log.cc:
  Fix crash in previous bug fix log.cc reported by Rob Lyon if --skip-innodb is specified

  add sorted_group_by parameter


sql-bench/crash-me.sh:
  add sorted_group_by parameter

into mysql.com:/home/walrus/bk/40

into mysql.com:/home/mysql_src/mysql-4.0

yet, better say it and see no traffic on bugs@ and support@.

into hundin.mysql.fi:/home/heikki/mysql-4.0


sql/log.cc:
  Auto merged

because of writing problems (such message would have been useful during a recent
support task).

  Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled


sql/log.cc:
  Fix bug number 224: do not call ha_report_binlog_offset_and_commit() when a MyISAM table is updated; this also makes CREATE TABLE not to commit an InnoDB transaction, even when binlogging is enabled

into hynda.(none):/home/my/bk/mysql-4.0

sql/log_event.cc:
  Fixed a wrong && test -> &

into narttu.mysql.fi:/my/mysql-4.0

ENABLE / DISABLE KEYS

mysql-test/r/innodb.result:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
mysql-test/t/innodb.test:
  A test case for non-functional rollback after inserting a row into
  MyISAM table with binary log enabled.
sql/sql_show.cc:
  Displaying disabled keys in SHOW KEYS
sql/sql_table.cc:
  Fix for a serious bug with ALTER TABLE ENABLE / DISABLE KEYS

mixed wrongly sometimes.

into narttu.mysql.fi:/my/mysql-4.0


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

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0

sql/log_event.cc:
  fix bug #183 (Replication of temporary tables not working)

  correct misprint in the test_update


sql-bench/test-transactions.sh:
  correct misprint in the test_update

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA_BUG/mysql-4.0

mysys/my_vsnprintf.c:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/log.cc:
  Auto merged

mysys/my_vsnprintf.c:
  safety fix
sql/log.cc:
  safety fix

mysqldump --delete-master-logs
Portability fix for hammer
Memory overrun for MyISAM
LOAD DATA LOCAL replication bug fix.


BitKeeper/etc/logging_ok:
  auto-union
sql/log.cc:
  Auto merged
client/client_priv.h:
  Merge with 3.23
client/mysqldump.c:
  Merge with 3.23
myisam/mi_dynrec.c:
  Merge with 3.23
mysql-test/t/myisam.test:
  Merge with 3.23
sql/log_event.cc:
  Merge with 3.23
sql/slave.cc:
  Merge with 3.23
sql/sql_delete.cc:
  Merge with 3.23

sql/log.cc:
  Portability fix (for hammer)

into narttu.mysql.fi:/my/mysql-4.0

whenever a temporary MyISAM table had to be created from HEAP table.

apply to GRANT and REVOKE too. For example if replicate-wild-ignore-table=mysql.%,
GRANT and REVOKE will not be replicated on the slave.

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

logged, but read as LOAD DATA INFILE REPLACE"
This was just bad && instead of &, but nasty consequences.
This should be merged to 4.0 BUT it will not be automatic (some code
has moved from log_event.h to log_event.cc, and log_event.cc has changed);
please Merging Man, do 'bk grep REPLACE_FLAG' in 4.0/sql
to find all the new places.


sql/log_event.cc:
  & instead of && when testing flags
sql/slave.cc:
  & instead of && when testing flags

into mysql.com:/home/greg/bk/mysql-4.0

BitKeeper/deleted/.del-mysqld.xdc~1befdfee55e31716:
  Delete: netware/mysqld.xdc
BitKeeper/deleted/.del-nwbootstrap~f3bc723dad4ed7e:
  Delete: netware/nwbootstrap
BitKeeper/deleted/.del-nwconfigure~86da352b5e031ed9:
  Delete: netware/nwconfigure
BitKeeper/deleted/.del-libmysqld.def~6ca0fa0537a3431c:
  Delete: netware/libmysqld.def

   libmysqld/examples/Makefile.am (thanks to Christian Hammers from Debian
   for pointing this out)


libmysqld/examples/Makefile.am:
   - added missing @WRAPLIBS@ to LIBS

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

mysql-test/r/query_cache.result:
  test of SET OPTION SQL_SELECT_LIMIT
mysql-test/t/query_cache.test:
  test of SET OPTION SQL_SELECT_LIMIT
sql/sql_cache.cc:
  layout fixed
  SQL_SELECT_LIMIT stored in query cache now
sql/sql_parse.cc:
  room for SQL_SELECT_LAYOUT storing added