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

  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

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

(First one is used)


scripts/safe_mysqld.sh:
  Don't allow multiple --user options
sql/mysqld.cc:
  Don't allow multiple --user options

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

Fixed memory leak when replication restarts in debug mode


include/my_sys.h:
  Added option to not overwrite files to my_copy()
mysql-test/mysql-test-run.sh:
  Fixed --ddd option
  Fixed that mysqld is restarted if there is a testname-master.sh file
mysql-test/r/backup.result:
  Update for security fix in BACKUP TABLE
mysql-test/t/backup.test:
  Update for security fix in BACKUP TABLE
mysys/my_copy.c:
  Added option to not overwrite files to my_copy()
sql/ha_myisam.cc:
  Don't allow BACKUP TABLE to overwrite files
sql/slave.cc:
  Fixed problem with --debug output from 'handle_slave'
  Fixed memory leak when replication restarts in debug mode

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

  Delete: innobase/stamp-h.in


BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5:
  Delete: innobase/stamp-h.in

(This patch is already in 4.0)


mysql-test/mysql-test-run.sh:
  Changed --debug to append to test instead of creating new trace files

libmysql/libmysql.c:
  Additional fix for connection being established during select()