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

  Increase max number of waiting threads to 10000 and put diagnostic prints if this value is exceeded


innobase/srv/srv0srv.c:
  Increase max number of waiting threads to 10000 and put diagnostic prints if this value is exceeded
innobase/include/os0thread.h:
  Increase max number of waiting threads to 10000 and put diagnostic prints if this value is exceeded

  On Monty's suggestion move ha_drop_database back inside LOCK_mysql_create_db, but we release LOCK_open during it to let possible running queries complete. I tested this and it seemed to work also in complex concurrent DELETE, SELECT, DROP DATABASE, and CREATE DATABASE situations


sql/sql_db.cc:
  On Monty's suggestion move ha_drop_database back inside LOCK_mysql_create_db, but we release LOCK_open during it to let possible running queries complete. I tested this and it seemed to work also in complex concurrent DELETE, SELECT, DROP DATABASE, and CREATE DATABASE situations

  from TeamOS/2 Italy
- removed some obsolete files on Yuri's request
- Added missing os2 related files outside the os2 subdirectory
  to the distribution


BitKeeper/deleted/.del-MySQL-All.icc~132f824bdf16897c:
  Delete: os2/MySQL-All.icc
BitKeeper/deleted/.del-MySQL-Client.irs~6dc13dcf3bbd5c0e:
  Delete: os2/MySQL-Client.irs
BitKeeper/deleted/.del-MySQL-Lib.icc~6775a33b1eeed98:
  Delete: os2/MySQL-Lib.icc
BitKeeper/deleted/.del-MySQL-ReadLine.icc~d7ab937c4ed8922f:
  Delete: os2/MySQL-ReadLine.icc
BitKeeper/deleted/.del-MySQL-binlog.icc~ec86ef1b392553e:
  Delete: os2/MySQL-binlog.icc
BitKeeper/deleted/.del-MySQL-binlog.irs~80d1800461e185d1:
  Delete: os2/MySQL-binlog.irs
BitKeeper/deleted/.del-MySQL-sql.irs~563a18a769b1785d:
  Delete: os2/MySQL-sql.irs
BitKeeper/deleted/.del-build-all.log~8dda947d95dfb926:
  Delete: os2/build-all.log
BitKeeper/deleted/.del-mysql.base~330f9ea62769c03a:
  Delete: os2/mysql.base
BitKeeper/deleted/.del-mysql.ih~767482ec101feda3:
  Delete: os2/mysql.ih
BitKeeper/deleted/.del-readme.os2~e8fe94e278248f7e:
  Delete: os2/readme.os2
configure.in:
  Added new os2 subdirectories
include/Makefile.am:
  Added include/config-os2.h to distribution
include/config-os2.h:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
mysys/Makefile.am:
  Added missing OS/2 files  in mysys to distribution
mysys/my_os2file64.c:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
mysys/my_os2thread.c:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/BldLevel.cmd:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/BldLevel.rc:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/ChangeLog.os2:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/Makefile.am:
  Fixed OS/2 file list (some new files, some have been removed)
os2/MySQL-Client.icc:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/MySQL-Opt.icc:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/MySQL-Source.icc:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/MySQL-Util.icc:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/MySQL-Util.irs:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/ReadMe.txt:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/build-all.cmd:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy
os2/rint.obj:
  Applied modifications provided by Yuri Dario <mc6530@mclink.it> from TeamOS/2 Italy

  Revert Monty's change to the positioning of ha_drop_database(): otherwise a running query on a table to be dropped in DROP DATABASE always causes the server to hang


sql/sql_db.cc:
  Revert Monty's change to the positioning of ha_drop_database(): otherwise a running query on a table to be dropped in DROP DATABASE always causes the server to hang

ppc64 and x86-64, fixed a compile bug when building with TCP wrapper
support on Linux


bdb/dist/acconfig.h:
  Added patch for x86_64 (provided by SuSE)
bdb/dist/aclocal/mutex.m4:
  Added patch for x86_64 (provided by SuSE)
bdb/include/mutex.h:
  Added patch for x86_64 (provided by SuSE)
include/global.h:
  Added a SMP-related patch for PPC64 (provided by SuSE)
sql/mysqld.cc:
  Compile fix for Linux when compiling with --with-librwap

Docs/manual.ja.texi:
  Fixed typo
Docs/manual.texi:
  Fixed typo, added changelog entry

Fix for access problem (merge from 4.0)


sql/sql_db.cc:
  Do handler specific drop-database at safe place.
sql/sql_parse.cc:
  Fix for access problem (merge from 4.0)

  Update my.cnf example files to reflect InnoDB autoextend and also simplify them for InnoDB


support-files/my-large.cnf.sh:
  Update my.cnf example files to reflect InnoDB autoextend and also simplify them for InnoDB
support-files/my-medium.cnf.sh:
  Update my.cnf example files to reflect InnoDB autoextend and also simplify them for InnoDB
support-files/my-small.cnf.sh:
  Update my.cnf example files to reflect InnoDB autoextend and also simplify them for InnoDB
support-files/my-huge.cnf.sh:
  Update my.cnf example files to reflect InnoDB autoextend and also simplify them for InnoDB

  Forgot to release an x-latch in DROP DATABASE


innobase/row/row0mysql.c:
  Forgot to release an x-latch in DROP DATABASE

  Protect InnoDB monitor with a mutex


innobase/srv/srv0srv.c:
  Protect InnoDB monitor with a mutex

I wish I had connection stop  / start so that I could have made a 
test case.


Docs/manual.texi:
  This is the only way to fix ALTER TABLE bug with BDB
sql/sql_table.cc:
  This is the only way to fix ALTER TABLE bug with BDB

  Remove debug code


innobase/srv/srv0srv.c:
  Remove debug code

  Eliminate potential division by zero


innobase/srv/srv0srv.c:
  Eliminate potential division by zero

  Merge InnoDB-3.23.52b


innobase/btr/btr0btr.c:
  Merge InnoDB-3.23.52b
innobase/btr/btr0cur.c:
  Merge InnoDB-3.23.52b
innobase/btr/btr0sea.c:
  Merge InnoDB-3.23.52b
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.52b
innobase/ha/ha0ha.c:
  Merge InnoDB-3.23.52b
innobase/ibuf/ibuf0ibuf.c:
  Merge InnoDB-3.23.52b
innobase/include/btr0cur.h:
  Merge InnoDB-3.23.52b
innobase/include/buf0buf.h:
  Merge InnoDB-3.23.52b
innobase/include/ha0ha.h:
  Merge InnoDB-3.23.52b
innobase/include/ibuf0ibuf.h:
  Merge InnoDB-3.23.52b
innobase/include/lock0lock.h:
  Merge InnoDB-3.23.52b
innobase/include/log0log.h:
  Merge InnoDB-3.23.52b
innobase/include/os0file.h:
  Merge InnoDB-3.23.52b
innobase/include/rem0rec.ic:
  Merge InnoDB-3.23.52b
innobase/include/srv0srv.h:
  Merge InnoDB-3.23.52b
innobase/include/sync0arr.h:
  Merge InnoDB-3.23.52b
innobase/include/sync0sync.h:
  Merge InnoDB-3.23.52b
innobase/include/trx0trx.h:
  Merge InnoDB-3.23.52b
innobase/lock/lock0lock.c:
  Merge InnoDB-3.23.52b
innobase/log/log0log.c:
  Merge InnoDB-3.23.52b
innobase/os/os0file.c:
  Merge InnoDB-3.23.52b
innobase/row/row0mysql.c:
  Merge InnoDB-3.23.52b
innobase/row/row0umod.c:
  Merge InnoDB-3.23.52b
innobase/row/row0upd.c:
  Merge InnoDB-3.23.52b
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.52b
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.52b
innobase/sync/sync0arr.c:
  Merge InnoDB-3.23.52b
innobase/sync/sync0sync.c:
  Merge InnoDB-3.23.52b
innobase/trx/trx0trx.c:
  Merge InnoDB-3.23.52b
sql/ha_innobase.h:
  Merge InnoDB-3.23.52b
sql/ha_innobase.cc:
  Merge InnoDB-3.23.52b
sql/sql_lex.h:
  Merge InnoDB-3.23.52b
sql/mysqld.cc:
  Merge InnoDB-3.23.52b
sql/sql_parse.cc:
  Merge InnoDB-3.23.52b
sql/sql_yacc.yy:
  Merge InnoDB-3.23.52b

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

(as when previous myrg_rkey failed, e.g. found nothing)

  Remove a debug printf which unintentionally was committed to the source tree


sql/ha_innobase.cc:
  Remove a debug printf which unintentionally was committed to the source tree

  Clarify the setting of innodb_data_file_path in my.cnf: it is in the [mysqld] section


sql/ha_innobase.cc:
  Clarify the setting of innodb_data_file_path in my.cnf: it is in the [mysqld] section

  Remove freeing of all memory at shutdown: since we do not exit the i/o-handlers and other threads, we could potentially get a seg fault at shutdown


innobase/srv/srv0start.c:
  Remove freeing of all memory at shutdown: since we do not exit the i/o-handlers and other threads, we could potentially get a seg fault at shutdown

  The UNIV_DEBUG version asserted if a foreign key check failed because of a lock wait timeout
btr0cur.c:
  Fix a bug: if the primary key was updated (or delete + insert) so that only the case of characters changed, we were left with a dangling adaptive hash index pointer, often causing an assertion failure in page0page.ic line 515


innobase/btr/btr0cur.c:
  Fix a bug: if the primary key was updated (or delete + insert) so that only the case of characters changed, we were left with a dangling adaptive hash index pointer, often causing an assertion failure in page0page.ic line 515
innobase/row/row0ins.c:
  The UNIV_DEBUG version asserted if a foreign key check failed because of a lock wait timeout

Docs/manual.texi:
  Changelog and fix of typo

configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Changelog
configure.in:
  Version update
isam/pack_isam.c:
  Fixed copyright
myisam/mi_cache.c:
  Indentation fixup

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

  Fix a bug: if buffer pool size > 2 GB on a 32-bit computer, we got an assertion failure because >> acted as a division operator (not as a register shift) for a wrapped-over integer value


innobase/include/buf0buf.ic:
  Fix a bug: if buffer pool size > 2 GB on a 32-bit computer, we got an assertion failure because >> acted as a division operator (not as a register shift) for a wrapped-over integer value

  Crash the server if file flush does not succeed: the database can get corrupt, better to crash it than let it run


innobase/os/os0file.c:
  Crash the server if file flush does not succeed: the database can get corrupt, better to crash it than let it run

  Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info


sql/slave.cc:
  Slave thread is always in an auto-commit state: remove unnecessary tests when we flush master info

  Initing a mutex with MY_MUTEX_INIT_FAST may relieve thread thrashing on Linux


innobase/os/os0sync.c:
  Initing a mutex with MY_MUTEX_INIT_FAST may relieve thread thrashing on Linux

  Merge 3.23.52


innobase/btr/btr0btr.c:
  Merge 3.23.52
innobase/btr/btr0cur.c:
  Merge 3.23.52
innobase/btr/btr0sea.c:
  Merge 3.23.52
innobase/include/btr0btr.h:
  Merge 3.23.52
innobase/include/btr0cur.h:
  Merge 3.23.52
innobase/include/btr0sea.h:
  Merge 3.23.52
innobase/include/buf0buf.h:
  Merge 3.23.52
innobase/include/buf0rea.h:
  Merge 3.23.52
innobase/include/data0data.h:
  Merge 3.23.52
innobase/include/data0data.ic:
  Merge 3.23.52
innobase/include/log0log.h:
  Merge 3.23.52
innobase/include/log0log.ic:
  Merge 3.23.52
innobase/include/os0file.h:
  Merge 3.23.52
innobase/include/page0page.h:
  Merge 3.23.52
innobase/include/page0page.ic:
  Merge 3.23.52
innobase/include/row0mysql.h:
  Merge 3.23.52
innobase/include/trx0roll.h:
  Merge 3.23.52
innobase/include/trx0sys.h:
  Merge 3.23.52
innobase/include/trx0trx.h:
  Merge 3.23.52
innobase/include/ut0ut.h:
  Merge 3.23.52
innobase/include/univ.i:
  Merge 3.23.52
innobase/include/ut0ut.ic:
  Merge 3.23.52
innobase/buf/buf0buf.c:
  Merge 3.23.52
innobase/buf/buf0rea.c:
  Merge 3.23.52
innobase/data/data0data.c:
  Merge 3.23.52
innobase/dict/dict0crea.c:
  Merge 3.23.52
innobase/dict/dict0dict.c:
  Merge 3.23.52
innobase/dict/dict0load.c:
  Merge 3.23.52
innobase/dict/dict0mem.c:
  Merge 3.23.52
innobase/fsp/fsp0fsp.c:
  Merge 3.23.52
innobase/ibuf/ibuf0ibuf.c:
  Merge 3.23.52
innobase/lock/lock0lock.c:
  Merge 3.23.52
innobase/log/log0log.c:
  Merge 3.23.52
innobase/log/log0recv.c:
  Merge 3.23.52
innobase/mtr/mtr0log.c:
  Merge 3.23.52
innobase/mtr/mtr0mtr.c:
  Merge 3.23.52
innobase/os/os0file.c:
  Merge 3.23.52
innobase/page/page0cur.c:
  Merge 3.23.52
innobase/page/page0page.c:
  Merge 3.23.52
innobase/rem/rem0cmp.c:
  Merge 3.23.52
innobase/row/row0ins.c:
  Merge 3.23.52
innobase/row/row0mysql.c:
  Merge 3.23.52
innobase/row/row0purge.c:
  Merge 3.23.52
innobase/row/row0upd.c:
  Merge 3.23.52
innobase/srv/srv0srv.c:
  Merge 3.23.52
innobase/srv/srv0start.c:
  Merge 3.23.52
innobase/trx/trx0roll.c:
  Merge 3.23.52
innobase/trx/trx0sys.c:
  Merge 3.23.52
innobase/trx/trx0trx.c:
  Merge 3.23.52
innobase/trx/trx0undo.c:
  Merge 3.23.52
innobase/ut/ut0mem.c:
  Merge 3.23.52
innobase/ut/ut0ut.c:
  Merge 3.23.52

  Use current_thd to check if a transaction is done by a slave thread


sql/ha_innobase.cc:
  Use current_thd to check if a transaction is done by a slave thread

  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1


sql/lex.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/mysql_priv.h:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1
sql/sql_yacc.yy:
  Add syntax SET NO_FOREIGN_KEY_CHECKS=1 and SET RELAXED_UNIQUE_CHECKS=1

  Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second


sql/mysqld.cc:
  Add option innodb_flush_log_at_trx_commit=2 which means we always write the log to file at commit, but only do fsync about once per second

  Merge 3.23.52


sql/ha_innobase.cc:
  Merge 3.23.52

  Add BEGIN andd COMMIT around transactions in the binlog


sql/handler.cc:
  Add BEGIN andd COMMIT around transactions in the binlog
sql/log.cc:
  Add BEGIN andd COMMIT around transactions in the binlog