Merge InnoDB-3.23.52c
ha_innobase.cc:
  Test the ref length sanity also in the production version


sql/ha_innobase.cc:
  Test the ref length sanity also in the production version
innobase/btr/btr0cur.c:
  Merge InnoDB-3.23.52c
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.52c
innobase/buf/buf0lru.c:
  Merge InnoDB-3.23.52c
innobase/ha/ha0ha.c:
  Merge InnoDB-3.23.52c
innobase/log/log0recv.c:
  Merge InnoDB-3.23.52c
innobase/mtr/mtr0log.c:
  Merge InnoDB-3.23.52c
innobase/os/os0file.c:
  Merge InnoDB-3.23.52c
innobase/page/page0cur.c:
  Merge InnoDB-3.23.52c
innobase/include/btr0btr.h:
  Merge InnoDB-3.23.52c
innobase/include/dyn0dyn.h:
  Merge InnoDB-3.23.52c
innobase/include/log0recv.h:
  Merge InnoDB-3.23.52c
innobase/include/buf0buf.ic:
  Merge InnoDB-3.23.52c
innobase/include/log0log.ic:
  Merge InnoDB-3.23.52c

Added back 'static inline', as not having this caused more problems than having it
Fixed wrong arguments to printf()


innobase/buf/buf0buf.c:
  Fixed wrong argument to printf()
innobase/fsp/fsp0fsp.c:
  Fixed wrong argument to printf()
innobase/include/btr0btr.h:
  Removed UNIV_INLINE for functions that should not be inlined
innobase/include/dyn0dyn.h:
  Removed UNIV_INLINE for functions that should not be inlined
innobase/include/univ.i:
  Added back 'static inline', as not having this caused more problems than having it

Removed some compiler warnings regarding 'static' from InnoDB


Docs/manual.texi:
  Fixed wrong manual entry
innobase/btr/btr0cur.c:
  Fixed wrong printf() string
innobase/include/univ.i:
  Removed compiler warnings (static inline produces a lot of warnings and is probably not portable)

Docs/manual.texi:
  SCCS merged

Docs/manual.texi:
  Changelog

  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log


sql/ha_innobase.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
sql/ha_innobase.cc:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/buf/buf0buf.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/dict/dict0dict.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/fil/fil0fil.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/fsp/fsp0fsp.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/ha/ha0ha.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/dict0dict.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/dict0mem.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/dyn0dyn.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/fsp0fsp.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/log0log.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/log0recv.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/trx0sys.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/trx0trx.h:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/include/log0log.ic:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/lock/lock0lock.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/log/log0log.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/log/log0recv.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/mem/mem0dbg.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/row/row0mysql.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/srv/srv0srv.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/srv/srv0start.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/trx/trx0sys.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log
innobase/trx/trx0trx.c:
  Merge InnoDB-3.23.52c; improve AUTO-INC algorithm with SHOW TABLE STATUS; new checksum in log

 - overhauled the RPM spec file (more macros, package descriptions)


support-files/mysql.server.sh:
   - Added LSB-compliant init script header
support-files/mysql.spec.sh:
   - Use some more macros (_mandir and _infodir)
   - Updated package description
   - Install binaries stripped to save disk space
   - Rearranged file list (make sure man pages are in
     the same package as the binaries)
   - clean up the BuildRoot directory afterwards
   - added mysqldumpslow to the server package

  Since MySQL commits the stmt always at the end of an INSERT, it is enough to release auto-inc lock at innobase_commit and innobase_rollback; add also more comments to code


sql/ha_innobase.cc:
  Since MySQL commits the stmt always at the end of an INSERT, it is enough to release auto-inc lock at innobase_commit and innobase_rollback; add also more comments to code

  procinfo -> proc_info to make ha_innobase.cc to compile, add more comments about ref


sql/ha_innobase.cc:
  procinfo -> proc_info to make ha_innobase.cc to compile, add more comments about ref
sql/ha_innobase.h:
  procinfo -> proc_info to make ha_innobase.cc to compile, add more comments about ref

Merge of ha_innobase.cc from 4.0; This fixes that MySQL doesn't allocate too big buffers when sorting innobase rows
Changed name of variables
NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
to avoid confusion with 'not...' variables.
Write name of adminstrator command to slow log.
Added mysqldumpslow to RPM


Docs/manual.texi:
  Changelog
sql/gen_lex_hash.cc:
  Updated values
sql/ha_innobase.cc:
  Remove return value of sprintf
  Merged back optimizations done in 4.0
  Fixed ref_length;  Caused MySQL to use big buffers when using InnoDB
sql/lex.h:
  Changed name of variables
  NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
  RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
sql/log.cc:
  Write name of adminstrator command to slow log
sql/sql_yacc.yy:
  Changed name of variables
  NO_FOREIGN_KEY_CHECKS -> FOREIGN_KEY_CHECKS
  RELAXED_UNIQUE_CHECKS -> UNIQUE_CHECKS
support-files/mysql.spec.sh:
  Added mysqldumpslow to RPM

  Backport the AIX crash fix changes from 4.0


innobase/include/dyn0dyn.h:
  Backport the AIX crash fix changes from 4.0
innobase/include/dyn0dyn.ic:
  Backport the AIX crash fix changes from 4.0

  Add diagnostic code to track a probable table corruption reported by a user


innobase/row/row0vers.c:
  Add diagnostic code to track a probable table corruption reported by a user

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

bugfix: uniques did not contributed to MYI tot_length estimation, which resulted in "Index file full" error on huge SELECT DISTINCT's

  Make the typecast trick pthread_t -> os_thread_id_t safer, but a full fix needs usage of appropriate Posix functions


innobase/configure.in:
  Make the typecast trick pthread_t -> os_thread_id_t safer, but a full fix needs usage of appropriate Posix functions
innobase/os/os0thread.c:
  Make the typecast trick pthread_t -> os_thread_id_t safer, but a full fix needs usage of appropriate Posix functions

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

Docs/manual.texi:
  Changelog

  Fix a bug in the storage of the SQL NULL value in 64-bit computers: the value code must fit in 32 bits


innobase/include/univ.i:
  Fix a bug in the storage of the SQL NULL value in 64-bit computers: the value code must fit in 32 bits

  Move the assertion in foreign keys to the right place


innobase/row/row0ins.c:
  Move the assertion in foreign keys to the right place

  Revert the test changes to wait for a full push of new auto-inc algorithm


innobase/dict/dict0dict.c:
  Revert the test changes to wait for a full push of new auto-inc algorithm

  Do not perform ON DELETE action for a FOREIGN KEY constraint if we are doing an UPDATE, not a DELETE
dict0dict.c:
  test


innobase/dict/dict0dict.c:
  test
innobase/row/row0ins.c:
  Do not perform ON DELETE action for a FOREIGN KEY constraint if we are doing an UPDATE, not a DELETE

Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
code cleanup


Docs/manual.texi:
  changelog
sql/ha_innobase.cc:
  Removed compiler warning
sql/slave.cc:
  Cleanup comments and indentation for suppressing connect warnings
sql/sql_db.cc:
  clean up comment
sql/sql_delete.cc:
  Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.
sql/sql_update.cc:
  Fix wrong usage of constant which could cause mysqld to use index when doing an update/delete on small tables.

  Align a buffer for i/o from a raw device


innobase/fil/fil0fil.c:
  Align a buffer for i/o from a raw device

  Fix a bug in the previous commit change and align also the buffer in simulataled aio for possible use in i/o to raw devices


innobase/os/os0file.c:
  Fix a bug in the previous commit change and align also the buffer in simulataled aio for possible use in i/o to raw devices

  Align the buffer used in initing a data file to zero; this may be needed if the data file is actually a raw device


innobase/os/os0file.c:
  Align the buffer used in initing a data file to zero; this may be needed if the data file is actually a raw device

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


sql/slave.cc:
  Auto merged

  Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51


sql/slave.cc:
  Suppress prints by slave.cc when there is a normal reconnect after the master has been quiet for the time of the net read timeout; this removes the Error 1159 messages many users have complained about in the replication of 3.23.51

BitKeeper/deleted/.del-errmsg.txt~7b5c3eb97e12d271:
  Delete: sql/share/pt_br/errmsg.txt
configure.in:
  Remove pt_br
sql/share/portuguese/errmsg.txt:
  Update portuhuese

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