sql/ha_innobase.cc:
  Auto merged

Fix of InnoDB variables in SHOW VARIABLES
Fix for ALTER TABLE and InnoDB


BUILD/FINISH.sh:
  Update to autoconf 2.52
BUILD/SETUP.sh:
  Update to autoconf 2.52
BUILD/compile-alpha:
  Update to autoconf 2.52
BUILD/compile-pentium-gcov:
  Update to autoconf 2.52
BUILD/compile-pentium-gprof:
  Update to autoconf 2.52
BUILD/compile-pentium:
  Update to autoconf 2.52
Docs/manual.texi:
  Changelog
acconfig.h:
  Update to autoconf 2.52
acinclude.m4:
  Update to autoconf 2.52
bdb/dist/configure.in:
  Update to autoconf 2.52
client/Makefile.am:
  Update to autoconf 2.52
configure.in:
  Update to autoconf 2.52
mysql-test/r/innodb.result:
  Update of InnoDB Cardinality values
mysys/Makefile.am:
  Update to autoconf 2.52
scripts/Makefile.am:
  Update to autoconf 2.52
sql/ha_innobase.cc:
  Fix of InnoDB variables in SHOW VARIABLES
sql/ha_innobase.h:
  Fix of InnoDB variables in SHOW VARIABLES
sql/sql_table.cc:
  Fix for ALTER TABLE and InnoDB
support-files/my-huge.cnf.sh:
  Fixed typo
support-files/my-large.cnf.sh:
  Fixed typo
support-files/my-medium.cnf.sh:
  Fixed typo
support-files/my-small.cnf.sh:
  Fixed typo

  Prevent a foreign key constraint references between INT columns where the signedness is different


innobase/rem/rem0cmp.c:
  Prevent a foreign key constraint references between INT columns where the signedness is different

  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock


sql/ha_innobase.cc:
  Remove use of prebuilt->trx, better play safe since we do not know MySQL call order of external_lock

  Small improvements
row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
ha_innobase.cc:
  Some fine-tuning of optimization


sql/ha_innobase.cc:
  Some fine-tuning of optimization
innobase/include/log0recv.h:
  Small improvements
innobase/include/mem0mem.h:
  Small improvements
innobase/include/mem0pool.h:
  Small improvements
innobase/include/row0mysql.h:
  Small improvements
innobase/include/srv0srv.h:
  Small improvements
innobase/include/trx0trx.h:
  Small improvements
innobase/buf/buf0lru.c:
  Small improvements
innobase/fil/fil0fil.c:
  Small improvements
innobase/log/log0recv.c:
  Small improvements
innobase/mem/mem0mem.c:
  Small improvements
innobase/mem/mem0pool.c:
  Small improvements
innobase/row/row0mysql.c:
  Small improvements + fix the ALTER TABLE problem by introducing a lazy drop table it can use
innobase/srv/srv0srv.c:
  Small improvements
innobase/srv/srv0start.c:
  Small improvements
innobase/trx/trx0purge.c:
  Small improvements
innobase/trx/trx0trx.c:
  Small improvements

  Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump


sql/ha_innobase.cc:
  Fix the crashes reported by Peter; SHOW CREATE does not call external_lock before calling ::info, and consequently the trx struct in prebuilt is obsolete; setting trx->op_info caused erratic memory corruption in mysqldump

into donna.mysql.fi:/home/heikki/mysqln

  Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity


sql/ha_innobase.cc:
  Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity
innobase/btr/btr0cur.c:
  Fine-tune optimization parameters; in small tables the estimates are accurate; in big tables let us not be too optimistic about index selectivity

Docs/manual.texi:
  changelog
sql/sql_acl.cc:
  Fix REFERENCE -> REFERENCES

  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk


sql/ha_innobase.cc:
  Assume selectivity of any key prefix is better than 1 / 100, regardless of what the estimator returns; this balances the pessimistic assumption of the optimizer thatany secondary key access to the full row incurs a page read from disk

  Add more diagnostic code to cath possible memory corruption


innobase/mem/mem0mem.c:
  Add more diagnostic code to cath possible memory corruption

  Add an assert
dyn0dyn.h:
  Reduce stack consumption


innobase/include/dyn0dyn.h:
  Reduce stack consumption
innobase/include/page0page.ic:
  Add an assert

  Merge InnoDB-.48


sql/ha_innobase.cc:
  Merge InnoDB-.48
innobase/include/dict0dict.h:
  Merge InnoDB-.48
innobase/include/dict0mem.h:
  Merge InnoDB-.48
innobase/include/mem0dbg.h:
  Merge InnoDB-.48
innobase/include/mem0mem.h:
  Merge InnoDB-.48
innobase/include/que0que.h:
  Merge InnoDB-.48
innobase/include/row0mysql.h:
  Merge InnoDB-.48
innobase/include/srv0srv.h:
  Merge InnoDB-.48
innobase/include/trx0sys.h:
  Merge InnoDB-.48
innobase/include/trx0trx.h:
  Merge InnoDB-.48
innobase/include/mem0mem.ic:
  Merge InnoDB-.48
innobase/dict/dict0dict.c:
  Merge InnoDB-.48
innobase/dict/dict0mem.c:
  Merge InnoDB-.48
innobase/log/log0recv.c:
  Merge InnoDB-.48
innobase/mem/mem0dbg.c:
  Merge InnoDB-.48
innobase/mem/mem0mem.c:
  Merge InnoDB-.48
innobase/pars/lexyy.c:
  Merge InnoDB-.48
innobase/que/que0que.c:
  Merge InnoDB-.48
innobase/rem/rem0rec.c:
  Merge InnoDB-.48
innobase/row/row0mysql.c:
  Merge InnoDB-.48
innobase/row/row0sel.c:
  Merge InnoDB-.48
innobase/srv/srv0srv.c:
  Merge InnoDB-.48
innobase/sync/sync0arr.c:
  Merge InnoDB-.48
innobase/trx/trx0sys.c:
  Merge InnoDB-.48
innobase/trx/trx0trx.c:
  Merge InnoDB-.48
innobase/trx/trx0undo.c:
  Merge InnoDB-.48

  Tell table handlers where a binlog segment for a trx ends


sql/log.cc:
  Tell table handlers where a binlog segment for a trx ends
sql/sql_class.h:
  Tell table handlers where a binlog segment for a trx ends
sql/handler.cc:
  Tell table handlers where a binlog segment for a trx ends
sql/handler.h:
  Tell table handlers where a binlog segment for a trx ends
sql/ha_innobase.h:
  Tell table handlers where a binlog segment for a trx ends
sql/ha_innobase.cc:
  Tell table handlers where a binlog segment for a trx ends

Docs/manual.texi:
  Changelog
mysql-test/r/join.result:
  Test of join bug
mysql-test/t/join.test:
  Test of join bug
mysys/hash.c:
  Fix for SUNPRO_C
scripts/mysql_config.sh:
  Fix for MacOS X

  Inc the version


client/mysqldump.c:
  Inc the version

  Added missing 'Q' for -Q option


client/mysqldump.c:
  Added missing 'Q' for -Q option
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

  Better error message if we hit the max process size in FreeBSD


innobase/ut/ut0mem.c:
  Better error message if we hit the max process size in FreeBSD

  Add better error message if access rights are wrong


innobase/os/os0file.c:
  Add better error message if access rights are wrong

  Fix typo


innobase/srv/srv0start.c:
  Fix typo

  Improve error messages which may occur in installation


innobase/os/os0file.c:
  Improve error messages which may occur in installation

configure.in:
  Update to 3.23.48

Docs/manual.texi:
  Auto merged

Docs/manual.texi:
  Cleanup
include/global.h:
  Portability fix

  Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL


innobase/row/row0mysql.c:
  Remove erroneous warning of a duplicate key when the key in a UNIQUE secondary index contains a NULL

into donna.mysql.fi:/home/heikki/mysqlm


Docs/manual.texi:
  Auto merged

mysys/my_bitmap.c:
  Eliminate unresolved external linkage for bzero
sql/sql_do.cc:
  Eliminate warning for unreferenced local variable

  Make InnoDB startup option samples easier to understand, recommend not setting log files too big, because recovery slow


Docs/manual.texi:
  Make InnoDB startup option samples easier to understand, recommend not setting log files too big, because recovery slow

  Eliminate a gcc compiler bug in inlining


innobase/btr/btr0sea.c:
  Eliminate a gcc compiler bug in inlining

include/global.h:
  Portability fix for HPUX
sql/mysqld.cc:
  Add missing declaration.

Docs/manual.texi:
  Changelog
sql/sql_select.cc:
  Cleanup

  Make os_file_flush to ignore the error we get from a raw device in fsync


innobase/os/os0file.c:
  Make os_file_flush to ignore the error we get from a raw device in fsync

  Changed default of file_io_threads to 4 and lock_wait_timeout to 50 seconds
  Added a missing break: if not specified, innodb_fast_shutdown got the same value as ..flush_log_at_trx commit


sql/mysqld.cc:
  Changed default of file_io_threads to 4 and lock_wait_timeout to 50 seconds

  Print progress info of the applying log records to the database phase in recovery
srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster


innobase/srv/srv0srv.c:
  Do buffer pool flush and checkpoints more often to make recovery faster
innobase/log/log0recv.c:
  Print progress info of the applying log records to the database phase in recovery

  Increase table comment print size to 500 bytes to be able to print more foreign key constraint infos
ha_innobase.h:
  Change max key len back to 500 bytes because MySQL interpreter cannot handle more


sql/ha_innobase.h:
  Change max key len back to 500 bytes because MySQL interpreter cannot handle more
sql/ha_innobase.cc:
  Increase table comment print size to 500 bytes to be able to print more foreign key constraint infos