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

  Allow foreign keys refer between fixed and var length strings


innobase/rem/rem0cmp.c:
  Allow foreign keys refer between fixed and var length strings
innobase/include/data0type.ic:
  Allow foreign keys refer between fixed and var length strings

  Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value


sql/ha_innobase.h:
  Lower max key len to 3500 bytes because a secondary index record must also contain the primary key value

  Make sure no memory overrun of key buffer in range estimation


sql/ha_innobase.cc:
  Make sure no memory overrun of key buffer in range estimation

Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  Update results after InnoDB optimizer changes.

  Allow equal key values in a unique secondary index if the key value contains an SQL NULL


innobase/row/row0ins.c:
  Allow equal key values in a unique secondary index if the key value contains an SQL NULL

  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally


innobase/log/log0recv.c:
  Add warnings to recovery in some cases where log file might be corrupt and consequently recovery can be trusted less than normally

instead of DO RELEASE_LOCK()


mysql-test/t/rpl_get_lock.test:
  test for SELECT RELEASE() replication bug

  Add better instructions on how to specify innodb_data_file_path etc.


sql/ha_innobase.cc:
  Add better instructions on how to specify innodb_data_file_path etc.

Docs/manual.texi:
  ChangeLog
sql/gen_lex_hash.cc:
  Safety fix