mysql-test/r/join.result:
  Test of LEFT JOIN bug
mysql-test/t/join.test:
  Test of LEFT JOIN bug

This fixes a problem with SHOW PROCESSLIST


sql/log_event.cc:
  Fixes cases where thd->query was not protected
sql/sql_acl.cc:
  Table privileges was not reset on FLUSH PRIVILEGES if tables_priv was empty
sql/sql_db.cc:
  Fixes cases where thd->query was not protected

myisam/mi_create.c:
  Auto merged
sql/log.cc:
  Auto merged
innobase/btr/btr0sea.c:
  Merge with 3.23 (use local file)
sql/slave.cc:
  merge with 3.23
sql/sql_db.cc:
  Merge with 3.23
sql/sql_parse.cc:
  Merge with 3.23

This fixes a possible core dump problem in SHOW PROCESSLIST


sql/slave.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
sql/sql_db.cc:
  Only set thd->query to 0 if LOCK_thread_count is hold
  Also first set query_length, then query
sql/sql_parse.cc:
  Indentation changes

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

  Backport from 4.0: fix bug in adaptive hash index search


innobase/btr/btr0sea.c:
  Backport from 4.0: fix bug in adaptive hash index search

  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert


innobase/btr/btr0sea.c:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert
innobase/include/btr0sea.h:
  Fix a crash in page_dir_find_owner_slot if an adaptive hash index search coincides with purge or an insert

(like FLUSH TABLES).
(Code is already in 4.0)


sql/log.cc:
  Fixed bug with the --slow-log when logging an administrator command
  (like FLUSH TABLES).

  Fix bug in PAGE_CUR_LE_OR_EXTENDS search


innobase/page/page0cur.c:
  Fix bug in PAGE_CUR_LE_OR_EXTENDS search

sql/ha_innodb.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

BitKeeper/etc/ignore:
  added extra/mysql_waitpid

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

into hegel.local:/home/miguel/dev/mysql-4.0

  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST


sql/ha_innodb.cc:
  Had forgotten to change ha_innodb.cc to reflect that InnoDB now supports HA_READ_PREFIX_LAST

innobase/btr/btr0btr.c:
  Auto merged
ltconfig:
  Auto merged
innobase/include/btr0btr.h:
  Auto merged
innobase/log/log0log.c:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
man/isamlog.1:
  Auto merged
man/mysql.1:
  Auto merged
man/mysql_zap.1:
  Auto merged
man/isamchk.1:
  Auto merged
man/mysqlaccess.1:
  Auto merged
man/mysqladmin.1:
  Auto merged
man/mysqld_multi.1:
  Auto merged
man/mysqld.1:
  Auto merged
man/mysqld_safe.1:
  Auto merged
man/mysqldump.1:
  Auto merged
man/mysqlshow.1:
  Auto merged
man/replace.1:
  Auto merged
myisam/mi_unique.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/net_pkg.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
man/perror.1:
  Auto merged
Makefile.am:
  merge with 3.23
client/mysqltest.c:
  merge with 3.23
innobase/btr/btr0pcur.c:
  merge with 3.23 (use local file)
innobase/row/row0purge.c:
  merge with 3.23 (use local file)
scripts/mysql_fix_privilege_tables.sh:
  Merge with 3.23 (Apply debian patches)
sql/ha_innodb.cc:
  merge with 3.23 (use local file)
sql/mysqld.cc:
  Merge with 3.23 (use local file)
sql/net_serv.cc:
  Merge with 3.23 (use local file)
sql/sql_db.cc:
  Merge with 3.23 (use local file)

mysql-test/r/merge.result:
  test added
mysql-test/t/merge.test:
  test added

  Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle


sql/ha_innodb.cc:
  Backport from 4.1: make sure change_active_index is only called with a properly initialized InnoDB table handle

  Make SHOW INNODB STATUS aware when we are estimating index range size etc.


sql/ha_innodb.cc:
  Make SHOW INNODB STATUS aware when we are estimating index range size etc.

  Backport from 4.0: fix the BLOB hang if the index tree is of height 1


innobase/row/row0purge.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/btr/btr0btr.c:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1
innobase/include/btr0btr.h:
  Backport from 4.0: fix the BLOB hang if the index tree is of height 1

  Backport from 4.0: fix possible adaprive hash index latch hang


sql/ha_innobase.cc:
  Backport from 4.0: fix possible adaprive hash index latch hang

  Fix a typo


sql/ha_innodb.cc:
  Fix a typo

  Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing


sql/ha_innodb.cc:
  Fix a possible hang at the adaptive hash index latch if MySQL does query estimations also in the middle of a SELECT statement processing

  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded


innobase/srv/srv0srv.c:
  Make SHOW INNODB STATUS aware which trx's are waiting because of innodb_thread_concurrency exceeded

  Print also the thread ids in SHOW INNODB STATUS also in Linux


innobase/trx/trx0trx.c:
  Print also the thread ids in SHOW INNODB STATUS also in Linux

Allocate bigger default thread stack because of problems with glibc
Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
Fixed bug in replication when using auto_increment and LOAD DATA INFILE


include/my_global.h:
  Guard against compiling without -fno-exceptions
include/my_pthread.h:
  Allocate bigger default thread stack because of problems with glibc
mysql-test/r/null.result:
  Updated result
mysql-test/t/null.test:
  Test of using UPDATE/INSERT with NULL on not null fields.
sql/field_conv.cc:
  Fixed bug in UPDATE ... not_null_field=expression_that_returns_null
sql/sql_load.cc:
  Fixed bug in replication when using auto_increment and LOAD DATA INFILE

  Backport the InnoDB HANDLER bug fix from 4.1


sql/sql_handler.cc:
  Backport the InnoDB HANDLER bug fix from 4.1

  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it


innobase/row/row0purge.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0cur.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/btr/btr0btr.c:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0btr.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it
innobase/include/btr0cur.h:
  Fix a hang associated with an index tree of height 1 and purging of BLOB fields from it

  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards


innobase/srv/srv0srv.c:
  Add another diagnostic print to determine why the 'queries inside InnoDB' counter might drift upwards

  Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards
ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error


sql/ha_innodb.cc:
  Add more print space to SHOW INNODB STATUS; remove possible memory leak in case there is an error
innobase/trx/trx0trx.c:
  Add diagnostic prints to determine why the 'queries inside InnoDB' might drift upwards

Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat.
When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.


sql/item_cmpfunc.cc:
  Fixed core dump bug in str LIKE "%other_str%" where strings contained characters >= 128.
sql/log_event.cc:
  Fixed problem with replication LOAD DATA INFILE when using  --old-rpl-compat
sql/sql_load.cc:
  When executing on master LOAD DATA and InnoDB failed with 'table full' error the binary log was corrupted.