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 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

 - bumped up version number to 3.23.57 in configure.in

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

mysql-test/t/create.test:
  Test for empty table/column name
tests/grant.pl:
  More tests
tests/grant.res:
  More tests

  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range


sql/ha_innobase.cc:
  Fix bug: MySQL could erroneously return Empty set if InnoDB estimated index range size to 0 records though the range was not empty; MySQL also failed to do the next-key locking in the case of an empty index range

tests/grant.pl:
  More options for test
tests/grant.res:
  new test results

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

  typo fixed


sql/ha_myisam.cc:
  typo fixed

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

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

Changed that analyse(#) also affects strings


mysql-test/r/analyse.result:
  Better analyse test
mysql-test/t/analyse.test:
  Better analyse test
sql/sql_analyse.cc:
  NEWDATE -> DATE in anylyse() output
  Changed that analyse(#) also affects strings
  Fixed that number of elements in ENUM is limited by # not by #+1

   for the patch) (bug #135)

into sanja.is.com.ua:/home/bell/mysql/work-rand-3.23

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

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

mysql-test/r/select.result:
  test of random WHERE clause
mysql-test/t/select.test:
  test of random WHERE clause
sql/sql_select.cc:
  fixed bug of unchecked random part of WHERE clause

   (it barfs on these with a syntax error)


sql/net_serv.cc:
   - fixed C++-style comment (this file is copied as libmysql_r/net.c)
strings/ctype-tis620.c:
   - fixed many C++-style comments

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

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


mysql-test/mysql-test-run.sh:
  Auto merged

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