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)

  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

Build-tools/Do-compile:
   - Merged 4.0 modifications (--innodb, more verbose failure reports)

Docs/manual.texi:
  changelog

 - some cosmetical fixups (typos, comments)


client/mysqlbinlog.cc:
   - fix for gcc 3.0
configure.in:
   - fix for gcc 3.0
   - some cosmetic modifications (typos, comments)
include/global.h:
   - fix for gcc 3.0
   - some cosmetical fixes (typos, comments)
sql/mysqld.cc:
   - fix for gcc 3.0

  static nss linkingg issue


configure.in:
  static nss linkingg issue
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

configure.in:
   - Added missing line from 4.0 patch for static glibc linking

configure.in:
   - Fixed bug in previous patch for linking against libc (taken from 4.0)

Added missing mutex-lock around critical section in GRANT handling.


Docs/manual.texi:
  ChangeLog
sql/lock.cc:
  Change name -> alias in TABLE_LIST.
sql/slave.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_acl.cc:
  Added missing mutex-lock around critical section in GRANT handling.
  Changed name -> alias
sql/sql_base.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_insert.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_parse.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_show.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_table.cc:
  Change name -> alias in TABLE_LIST.
sql/sql_udf.cc:
  Change name -> alias in TABLE_LIST.
sql/table.h:
  Change name -> alias in TABLE_LIST.
tests/grant.pl:
  Fixed grant test

   of the static_nss stuff required for linking against the patched
   glibc)


configure.in:
   - Applied some modifications from the 4.0 configure.in to fix some
     typos and platform-specific issues (Solaris 2.6, Mac OS 10.2)

Docs/manual.texi:
  ChangeLog
mysql-test/r/binary.result:
  Test of binary NULL
mysql-test/t/binary.test:
  Test of binary NULL

Docs/manual.texi:
  changelog

Docs/manual.texi:
  Changelog

  Fix typos in previous push


innobase/row/row0mysql.c:
  Fix typos in previous push

  Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table


innobase/row/row0mysql.c:
  Allow CREATE TABLE and DROP TABLE even if innodb_force_recovery is used, the user can drop a problematic table

  Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change
os0file.c:
  Start using unbuffered i/o again in Windows because sequential read using normal i/o was 4 times slower in XP


innobase/os/os0file.c:
  Start using unbuffered i/o again in Windows because sequential read using normal i/o was 4 times slower in XP
innobase/include/srv0srv.h:
  Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change
innobase/srv/srv0srv.c:
  Change srv_flush_log_at_trx_commit to ulint, note that ibool is defined as ulint, so this is purely formal change

  Cleanup after last push


sql/ha_innobase.cc:
  Cleanup after last push

  update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2 
ha_innobase.h, ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params


sql/ha_innobase.cc:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/ha_innobase.h:
  make innobase_flush_log_at_trx_commit a long, like other params
sql/mysqld.cc:
  update help innobase_flush_log_at_trx_commitcan have vals 0, 1, 2

  Fix a typo: should be buf_page_print


innobase/os/os0file.c:
  Fix a typo: should be buf_page_print

  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52


sql/ha_innobase.h:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52
sql/ha_innobase.cc:
  innodb_flush_log_at_trx_commit can have values 0, 1, 2 starting from 3.23.52

  Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace


innobase/trx/trx0undo.c:
  Remove an assertion in trx0undo.c which could erroneously fail when we ran out of tablespace

  Increase max latch wait time to 600 seconds before we assert


innobase/sync/sync0arr.c:
  Increase max latch wait time to 600 seconds before we assert

  Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read


innobase/btr/btr0cur.c:
  Remove long latch hold which happened if we scanned long an index without finding any record visible to the current consistent read

  Add diagnostics to track why a semaphore creation failed on Windows ME


innobase/os/os0sync.c:
  Add diagnostics to track why a semaphore creation failed on Windows ME

  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that


innobase/srv/srv0srv.c:
  The option (= default) innodb_fast_shutdown did not always make the shutdown quickly, fix that

   better documented


Build-tools/Do-compile:
   - Removed some obsolete pieces of code (get rid of using rsh and rcp)
   - Added some code comments
   - Reworked help text to match the options available
   - Heavily reworked GetOptions, removed some obsolete ones and joined others
   - make_options and config_options can now be given multiple times
   - simplified code that added configure options dependent on given options

Docs/manual.texi:
  SCCS merged

(Fixing of problem with ALTER TABLE on BDB tables)


mysql-test/r/distinct.result:
  Fixed results after bug fix
sql/mysql_priv.h:
  Split close_thread_tables() into two functions.
  (Needed for bug fix from 4.0)
sql/sql_base.cc:
  Split close_thread_tables() into two functions.
  (Needed for bug fix from 4.0)

Better fix for ALTER TABLE on BDB tables
(Both of the above fixes are already in 4.0)


Docs/manual.texi:
  Changelog
sql/item_cmpfunc.cc:
  Check if AND/OR expression can be NULL
sql/sql_table.cc:
  Better fix for ALTER TABLE on BDB tables