MEMORY is alias for HEAP for CREATE TABLE ... TYPE=HEAP
Fixed bug in multi-table-update where a row could be updated several times


mysql-test/r/heap.result:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/r/innodb.result:
  Added multi-update-test
mysql-test/r/multi_update.result:
  Added multi-update-test
mysql-test/t/heap.test:
  Test of CREATE TABLE ... type=MEMORY
mysql-test/t/innodb.test:
  Added multi-update-test
mysql-test/t/multi_update.test:
  Added multi-update-test
sql/ha_innodb.h:
  Allow optimzation of multi-table-update also for InnoDB tables
sql/handler.h:
  Allow optimzation of multi-update also for InnoDB tables
sql/key.cc:
  After merge fix
sql/lex.h:
  MEMORY is alias for HEAP
sql/sql_test.cc:
  Fixed wrong printf
sql/sql_update.cc:
  Fixed bug in multi-table-update where a row could be updated several times
sql/sql_yacc.yy:
  MEMORY is alias for HEAP

innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
sql/key.cc:
  Auto merged
configure.in:
  Merge with 3.23
mysql-test/r/innodb.result:
  Merge with 3.23
mysql-test/t/innodb.test:
  Merge with 3.23
strings/strto.c:
  Merge with 3.23

sql/ha_myisam.cc:
  Added function comment

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

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

Ensure that \ is not allowed in filenames, even on Unix


include/my_dbug.h:
  Rename: include/dbug.h -> include/my_dbug.h
include/Makefile.am:
  Change dbug.h -> my_dbug.h
include/my_global.h:
  Change dbug.h -> my_dbug.h
libmysql/get_password.c:
  Change dbug.h -> my_dbug.h
libmysqld/lib_vio.c:
  Change dbug.h -> my_dbug.h
sql/table.cc:
  Ensure that \ is not allowed in filenames, even on Unix

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

mysql-test/r/create.result:
  After merge fix
sql/sql_insert.cc:
  Write binlog before commit
sql/sql_update.cc:
  Added comment

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 compiler warning in Windows about ib_longlong to ulint conversion


innobase/trx/trx0roll.c:
  Fix compiler warning in Windows about ib_longlong to ulint conversion

  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

  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

client/mysqlshow.c:
   - fixed C++-style comment to make IBM C compiler happy

 - bumped up version number to 3.23.57 in configure.in

- Fix for empty table/column names


mysql-test/t/create.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.pl:
  Auto merged
sql/filesort.cc:
  merge with 3.23
sql/sql_table.cc:
  merge with 3.23
tests/grant.res:
  merge with 3.23

sql/sql_parse.cc:
  Removed not needed test

into mysql.com:/Users/mysqldev/my/mysql-4.0

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

the output of the script.


scripts/mysql_tableinfo.sh:
  Small fixes in this program which I contributed some time ago. These fixes
  are waiting in Monty's mailbox since August, and there are tiny :
  * use array{'x'} instead of array{x}
  * use fetchrow_arrayref instead of fetchrow_array
  * try to hide the command-line options from 'ps' like mysqlhotcopy does
  * use 'map' instead of homegrown function
  * use $_ instead of $i when possible

  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

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

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

sql/filesort.cc:
  SCCS merged

into mysql.com:/space/my/mysql-4.0

   already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files

sql/sql_base.cc:
  Auto merged
tests/grant.res:
  Auto merged

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

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

   "DBUG_RETURN undeclared" on Mac OS X)

man/perror.1:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
mysql-test/r/analyse.result:
  ul
mysql-test/r/group_by.result:
  ul
mysql-test/r/select.result:
  ul

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


sql/mysqld.cc:
  Auto merged