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

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

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

  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

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

Docs/manual.texi:
  Changelog

myisam/mi_open.c:
  Fixed problem with wrongly calculated max_data_file_length
mysql-test/Makefile.am:
  Added  missing .require test files
scripts/mysqlhotcopy.sh:
  Remove end / from directory names (portability fix)
tests/grant.res:
  Update of test results

Docs/manual.texi:
  ChangeLog

  test


sql/ha_innobase.cc:
  test

sql/log.cc:
  moved mutex back to after is_open() test,
  but still protecting name dereference (the real problem)

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

(possibly also fixes binlog filename corruption problems--hasn't
been reproduced since)


sql/log.cc:
  Fixed race caused by calling MYSQL_LOG::is_open() outside of critical section.
sql/sql_parse.cc:
  added missing args to calls to MYSQL_LOG::new_file(bool)
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

scripts/safe_mysqld.sh:
  fix for a small type

  SHOW INNODB STATUS always showed average bytes read as 0 in Unix


innobase/os/os0file.c:
  SHOW INNODB STATUS always showed average bytes read as 0 in Unix

  Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation
btr0cur.h, ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows


sql/ha_innobase.cc:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/include/btr0cur.h:
  Use longlong in range estimation, in case there are > 4 billion rows
innobase/btr/btr0cur.c:
  Do not let range estimator to return over 1 / 2 of total rows in table; use longlong in range estimation

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

  Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex


innobase/lock/lock0lock.c:
  Fix bug: if SHOW INNODB STATUS or innodb_monitor printed several hundred transactions, the output was truncated and we forgot to release the kernel mutex

  Remove unintentionally pushed assert


sql/ha_innobase.cc:
  Remove unintentionally pushed assert

into hundin.mysql.fi:/home/heikki/mysql

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

   InnoDB, so test it after InnoDB)


Build-tools/Do-compile:
   - Test BDB after InnoDB (BDB tends to fail more often than InnoDB)

  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used


sql/ha_innobase.h:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used
sql/ha_innobase.cc:
  Backport from 4.0.4 the bug fix of the crash when a temporary table was created inside LOCK TABLES and used

  Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers


innobase/include/os0thread.h:
  Fix the probable reason why InnoDB versions after July 2, 2002 did not start properly in some Win 95/98/ME computers

   with static glibc installed


configure.in:
   - Better fix for building shared libraries with a patched glibc
     (from 4.0 tree)
   - removed obsolete comment

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

 - Updated scripts/make_binary_distribution.sh to include the correct
   ChangeLog and the LICENSE file for non-GPL builds


scripts/make_binary_distribution.sh:
   - Add BK ChangeLog (if existing) instead of sql/ChangeLog, which is
     not updated anymore since we switched to BK
   - Add LICENSE, if exists (required for non-GPL binary builds)
support-files/mysql.spec.sh:
   - MySQL-Max now requires MySQL to be the same version (to
     avoid version mismatches e.g. mixing 3.23.xx and 4.0 packages)

  Fix bug: the AUTO-INC lock was held to the end of trx if it was granted after a lock wait


innobase/lock/lock0lock.c:
  Fix bug: the AUTO-INC lock was held to the end of trx if it was granted after a lock wait