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

into mashka.mysql.fi:/home/my/mysql-3.23

(this bug was already fixed in 4.0, I just copied and pasted two lines).

into eagle.mysql.r18.ru:/home/vva/work/LOADDATA/mysql-3.23


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

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

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

  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix


innobase/os/os0sync.c:
  Backport from 4.0: We had forgotten to call pthread_mutex_destroy when we free an OS mutex in Unix

sql/sql_show.cc:
  SHOW TABLE STATUS displayed wrong Row_format for myisampack'ed tables.

Security patch to remove wrong error when one had a global update/delete privilige and a database specific SELECT privilege. 


sql/sql_acl.cc:
  Security patch
sql/sql_base.cc:
  Security patch
sql/sql_parse.cc:
  Security patch
tests/grant.pl:
  Test of security patch
tests/grant.res:
  Test of security patch

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

All tests plus grant.pl test passed.

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

into serg.mylan:/usr/home/serg/Abk/mysql


client/mysqldump.c:
  Auto merged
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/mysqld.cc:
  Safety fix.

Backported fix from 4.1 for bug 212: SELECT query containing a NATURAL JOIN and parentheses in the WHERE clause


mysql-test/r/join.result:
  New test results
mysql-test/t/join.test:
  Test for bug 212
sql/log_event.cc:
  Removed wrong cast
sql/log_event.h:
  Fixed problem with timestamps in binary log on 64 bit machines
sql/sql_list.h:
  Fix for bug 212 (back ported from 4.1)

into mashka.mysql.fi:/home/my/mysql-3.23


sql/slave.cc:
  Auto merged

Fixed problem with not freed thr_alarm() on slave connect


mysql-test/t/rpl_alter.test:
  Changed name of created test database
sql/ha_innobase.cc:
  Changed innobase_flush_log_at_trx_commit to be 1 as default
sql/mini_client.cc:
  Fixed problem with not freed thr_alarm()
sql/mysqld.cc:
  Allocate some extra thr_alarm slots just to be safe
sql/slave.cc:
  Simple code cleanup

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

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

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

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

least one BLOB column.

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

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

only do it if the user specifies --delete-master-logs (new option).
Safer + fixes bug #159.


client/client_priv.h:
  New option --delete-master-logs for mysqldump
client/mysqldump.c:
  New option --delete-master-logs for mysqldump
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

mysql-test/r/innodb.result:
  Test of 'halloween bug'
mysql-test/t/innodb.test:
  Test of 'halloween bug'
strings/strto.c:
  Portability fix

into serg.mysql.com:/usr/home/serg/Abk/mysql

into mashka.mysql.fi:/home/my/mysql-3.23

  Test if merging from 3.23 to 4.0 succeeds


innobase/row/row0mysql.c:
  Test if merging from 3.23 to 4.0 succeeds

  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal


innobase/row/row0sel.c:
  Fix bug number 154: GROUP BY and DISTINCT could treat NULL values inequal