BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Auto merged
BitKeeper/deleted/.del-MySQLEULA.txt:
  Delete: Docs/MySQLEULA.txt
BitKeeper/deleted/.del-global.h~e80d28157acfdcb5:
  Auto merged
Build-tools/mysql-copyright-2:
  Auto merged
Build-tools/mysql-copyright:
  Auto merged
heap/heapdef.h:
  Auto merged
heap/hp_open.c:
  Auto merged
innobase/btr/btr0cur.c:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysys/safemalloc.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/table.cc:
  Auto merged
tests/grant.res:
  Auto merged
Build-tools/Do-compile:
  merge
Docs/manual.texi:
  merge
configure.in:
  merge
mysql-test/r/distinct.result:
  merge
mysql-test/r/null_key.result:
  merge
sql/ha_innodb.cc:
  merge
sql/item.h:
  merge
sql/log.cc:
  merge
sql/mysqld.cc:
  merge
support-files/mysql.spec.sh:
  merge

Docs/manual.texi:
  ChangeLog
sql/field.h:
  New virtual function to set a field to null or signal an error
sql/field_conv.cc:
  New function to set a field to null or signal an error
sql/item.cc:
  When setting a field to null internally (for WHERE testing) don't autoconvert NULL -> now() or last_insert_id()
sql/item.h:
  New virtual function to set a field to null or signal an error

  Fix typo in earlier commit


innobase/btr/btr0cur.c:
  Fix typo in earlier commit

  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level


innobase/btr/btr0cur.c:
  Fix bug: range estimator exaggerated small range size greatly if the paths in the B-tree happened to branch on a high level

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

Build-tools/Do-compile:
   - fixed brainfart that ruined the 3.23.53-Max binaries: of course
     "--with-innodb" has to be added, when requested (will be part of
     3.23.53a packages now)

Docs/manual.texi:
  ChangeLog

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

create_tmp_table fails.

Docs/manual.texi:
  Auto merged

WHERE column_name = key_column_name was calculated as true
for NULL values.


Docs/manual.texi:
  Changelog
mysql-test/r/distinct.result:
  Updated results caused by bug fix.
mysql-test/r/null_key.result:
  New tests
mysql-test/t/null_key.test:
  New tests
sql/sql_select.cc:
  Additional change for previous changeset for using BLOB in GROUP BY

Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
Don't initalize memory areas when run with --skip-safemalloc.


Docs/manual.texi:
  ChangeLog
heap/heapdef.h:
  Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
heap/hp_open.c:
  Allocate HEAP blocks in smaller blocks to get better memory utilization and more speed when used with safemalloc.
mysys/safemalloc.c:
  Don't initalize memory areas when run with --skip-safemalloc.
  This can in some cases increase speed with 20 times when debugging

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

 - Updated scripts/make_binary_distribution and scripts/mysql-copyright*
   accordingly


BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Delete: Docs/LICENSE
BitKeeper/deleted/.del-MySQLEULA.doc~e7fa298916345cf3:
  Delete: Docs/MySQLEULA.doc
Build-tools/mysql-copyright-2:
   - replaced LICENSE with MySQLEULA.txt
Build-tools/mysql-copyright:
   - replaced LICENSE with MySQLEULA.txt
scripts/make_binary_distribution.sh:
   - replaced LICENSE with MySQLEULA.txt

Docs/MySQLEULA.txt:
   - replaced tabs with spaces

 - bumped up version number to 3.23.54 in configure.in
 - replaced Docs/LICENSE with Docs/MySQLEULA.txt and modified
   scripts/make_binary_distribution.sh and Build-tools/mysql-copyright*
   accordingly.


BitKeeper/deleted/.del-LICENSE~4cfaff8de837acb8:
  Delete: Docs/LICENSE
Build-tools/mysql-copyright-2:
   - replaced LICENSE with MySQLEULA.txt
Build-tools/mysql-copyright:
   - use "tar" instead of "gtar"
   - replaced LICENSE with MySQLEULA.txt
configure.in:
   - Bumped up version number to 3.23.54 now that 3.23.53 has been
     tagged
scripts/make_binary_distribution.sh:
   - replaced LICENSE with MySQLEULA.txt

Docs/manual.texi:
  added text for fixes
mysql-test/r/multi_update.result:
  new test case for multi-table deletes
mysql-test/t/multi_update.test:
  new test case for multi-table deletes
sql/sql_delete.cc:
  fix for multi-table deletes
sql/sql_update.cc:
  fix for multi-table updates

GROUP BY ... ORDER BY queries.


Docs/manual.texi:
  ChangeLog

  Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20


innobase/os/os0thread.c:
  Fix compilation error on HP-UX-11: pthread_t is a scalar there, not a struct like in HP-UX-10.20

Docs/manual.texi:
   - added missing changelog entry
   - fixed typo

   from manual texi


Docs/manual.texi:
   - removed version numbers of GNU tools from the feature list
     (they are going to change from time to time again and the current
     required version number should probably be kept in one chapter only)

Docs/manual.texi:
  SCCS merged

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

 - currently, "make distcheck" fails - this needs to be investigated
   before the next release


Docs/manual.texi:
   - Updated toolchain version numbers
config.guess:
   - removed explicit setting of VENDOR=suse on SuSE systems

  Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed


sql/ha_innobase.cc:
  Fix bug: if skip-innodb was defined SHOW INNODB STATUS crashed

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

Docs/manual.texi:
   - fixed typo in changelog entry (thanks to Jocelyn Fournier for spotting
     this)

Docs/manual.texi:
  Changelog

into beta.frontier86.ee:/stuff/bk/mysql-4.0


Docs/manual.texi:
  Auto merged

  Contrib overhaul


Docs/manual.texi:
  Contrib overhaul