Do less statistics calculations for tables
dict0mem.h, row0mysql.c:
  Make calculation of new statistics less frequent, because the statistics in 3.23.44 involves many random disk reads


innobase/include/dict0mem.h:
  Do less statistics calculations for tables
innobase/row/row0mysql.c:
  Do less statistics calculations for tables
innobase/dict/dict0dict.c:
  Do less statistics calculations for tables
innobase/dict/dict0mem.c:
  Do less statistics calculations for tables

  Do not automatically calculate new statistics when a temporary table is used by MySQL in a query. The fact that some ORDER BY queries were slow may have been explained by this unnecessary statistics calculation.


sql/ha_innobase.cc:
  Do not automatically calculate new statistics when a temporary table is used by MySQL in a query. The fact that some ORDER BY queries were slow may have been explained by this unnecessary statistics calculation.

  Add diagnostic code to find out why foreign key constraint creation sometimes fails


innobase/dict/dict0crea.c:
  Add diagnostic code to find out why foreign key constraint creation sometimes fails

  Remove a theoretical overrun in adaptive hash index building


innobase/include/rem0rec.ic:
  Remove a theoretical overrun in adaptive hash index building

  Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized


innobase/buf/buf0buf.c:
  Eliminate a Purify warning in a multithreaded test: the fields are not protected by a mutex, therefore they can be read uninitialized

Docs/manual.texi:
  fixed bad merge
include/my_bitmap.h:
  fixed comment format
mysql-test/r/rpl_get_lock.result:
  make the test results predicable
mysql-test/t/rpl_get_lock.test:
  predicatable test results
mysys/my_bitmap.c:
  do not init/destroy mutex if bitmap is not declared thread safe
sql/slave.cc:
  clean-up suggested by Monty to make init_slave_skip_errors() more compact

sql/mysqld.cc:
  Auto merged

Docs/manual.texi:
  Changelog

Docs/manual.texi:
  ChangeLog

added extra/mysql_install.c - will work on it in 4.0, but it does not hurt
to have it sit in 3.23 tree for now since it will eventually be backported 
to 3.23 anyway 


Docs/manual.texi:
  documented slave-skip-errors
  updated change history
extra/resolve_stack_dump.c:
  fixed wrong help message
include/my_bitmap.h:
  bitmap code updates
mysql-test/r/rpl_get_lock.result:
  test for a possible bug in release_lock() replication
mysql-test/t/rpl_get_lock.test:
  test for possible bug in release_lock replication
mysys/my_bitmap.c:
  bitmap code updates/clean-up
sql/mysqld.cc:
  slave-skip-errors
sql/slave.cc:
  slave-skip-errors
sql/slave.h:
  slave skip errors

  Increase semaphore wait warning threshold to 240 seconds


innobase/sync/sync0arr.c:
  Increase semaphore wait warning threshold to 240 seconds

  Improve table cardinality estimate if there are big BLOBs


innobase/btr/btr0cur.c:
  Improve table cardinality estimate if there are big BLOBs

  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows


innobase/dict/dict0dict.c:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/ut/ut0byte.c:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows
innobase/include/ut0byte.h:
  Make column names non-case-sensitive in referential constraints and put table and database names there in lower case in Windows

Docs/manual.texi:
  Changelog
libmysql/libmysql.c:
  Fixed bug with mysql_use_result() when mysql_query() is called before mysql_free_result().
mysql-test/r/group_by.result:
  New tests
mysql-test/t/group_by.test:
  New tests
sql/stacktrace.c:
  Fix for SCO

Docs/manual.texi:
  Changelog
scripts/mysql_config.sh:
  Fix script to search in different directories for include and lib

Docs/manual.texi:
  ChangeLog
myisam/mi_locking.c:
  Remove wrong optimistic locking. (Doesn't affect MySQL)
mysys/my_init.c:
  Release character sets at end
scripts/mysqlhotcopy.sh:
  RAID tables are now copied

  Add diagnostic code to catch possible space id or page no errors in the log


innobase/include/mtr0log.ic:
  Add diagnostic code to catch possible space id or page no errors in the log
innobase/include/buf0buf.ic:
  Add diagnostic code to catch possible space id or page no errors in the log

  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there


innobase/log/log0recv.c:
  Add fault tolerance: when a log record contains nonsensical space id or page number, stop log scan there

scripts/mysql_config.sh:
  get correct paths even if the user moves basedir

added test case that supposedly will crash mysqld built with 2.96

Build-tools/Do-compile:
  Merge with 4.0
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  New tests cases for ORDER BY
mysql-test/r/myisam.result:
  New tests cases for ORDER BY
mysql-test/t/innodb.test:
  New tests cases for ORDER BY
mysql-test/t/myisam.test:
  New tests cases for ORDER BY

This should cause fewer seeks when using replication.


Docs/manual.texi:
  Changelog

fixed skip counter to do the RightThing (TM) when the user messes up.
Still do RightThing when he gets it right.


mysql-test/r/rpl000016.result:
  updated test result
mysql-test/t/rpl000013.test:
  test alias bug
mysql-test/t/rpl000016.test:
  test for proper skip when the user messes up
sql/slave.cc:
  proper skip even when the user goofs up
sql/sql_base.cc:
  drop real name, not last used alias in the log

Docs/manual.texi:
  Cleanup
extra/resolveip.c:
  Portability fix
man/safe_mysqld.1:
  Cleanup
mysys/mf_iocache2.c:
  Safety fix
scripts/make_binary_distribution.sh:
  Add mysqlbinlog

Fixed race condition when using the binary log and INSERT DELAYED which could cause the binary log to have rows that was not yet written to MyISAM tables.


Docs/manual.texi:
  Changelog
mysql-test/r/null_key.result:
  Fix of testcase after changing optimizer to only use range keys if it would use a long part of the SAME key.
sql/sql_insert.cc:
  Fixed race condition with binary log and INSERT DELAYED
sql/sql_select.cc:
  Fixed bug when joining with caching

Fixed bug where one got an empty set instead of a DEADLOCK error when using BDB tables.


Docs/manual.texi:
  Cleanup
configure.in:
  Version number change
mysql-test/t/backup.test:
  drop used tables
mysql-test/t/bdb-crash.test:
  cleanup
mysys/thr_lock.c:
  cleanup
sql/mysqld.cc:
  safety fix
sql/records.cc:
  Fixed bug where one got an empty set instead of a DEADLOCK error when using
  BDB tables.
sql/sql_table.cc:
  Fix race  condition in ANALYZE TABLE.

into mysql.sashanet.com:/home/sasha/src/bk/mysql

on a signal

mysys/my_seek.c:
  Remove warning

Docs/manual.texi:
  Changelog

sql/mysqld.cc:
  Auto merged

signal. Tested to the extent that it does not break Linux. Could not test on
Darwin because the machine was not reachable. Will push anyway - at least it
does not make things worse. Testing on Darwin is needed, however.


sql/mysqld.cc:
  backport of shutdown fix for platforms that cannot break a syscall with a signal