Merge with 4.0

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-.my_sys.h.swp~f6a4a7f8dae03f18:
  Auto merged
BitKeeper/etc/config:
  Auto merged
acconfig.h:
  Auto merged
acinclude.m4:
  Auto merged
Docs/manual.texi:
  Auto merged
client/mysqlcheck.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
include/myisam.h:
  Auto merged
include/violite.h:
  Auto merged
isam/pack_isam.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
myisam/Makefile.am:
  Auto merged
myisam/ft_nlq_search.c:
  Auto merged
myisam/mi_open.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/r/isam.result:
  Auto merged
mysql-test/r/rpl_replicate_do.result:
  Auto merged
mysql-test/r/variables.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/variables.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/tree.c:
  Auto merged
scripts/Makefile.am:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/hash_filo.h:
  Auto merged
sql/hostname.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_rename.cc:
  Auto merged
sql/sql_repl.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
sql/share/czech/errmsg.txt:
  Auto merged
sql/share/danish/errmsg.txt:
  Auto merged
sql/share/dutch/errmsg.txt:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged
sql/share/estonian/errmsg.txt:
  Auto merged
sql/share/french/errmsg.txt:
  Auto merged
sql/share/german/errmsg.txt:
  Auto merged
sql/share/greek/errmsg.txt:
  Auto merged
sql/share/hungarian/errmsg.txt:
  Auto merged
sql/share/italian/errmsg.txt:
  Auto merged
sql/share/japanese/errmsg.txt:
  Auto merged
sql/share/korean/errmsg.txt:
  Auto merged
sql/share/norwegian/errmsg.txt:
  Auto merged
sql/table.h:
  Auto merged
sql/unireg.cc:
  Auto merged
sql-bench/server-cfg.sh:
  Auto merged
sql/share/norwegian-ny/errmsg.txt:
  Auto merged
sql/share/polish/errmsg.txt:
  Auto merged
sql/share/portuguese/errmsg.txt:
  Auto merged
sql/share/romanian/errmsg.txt:
  Auto merged
sql/share/russian/errmsg.txt:
  Auto merged
sql/share/slovak/errmsg.txt:
  Auto merged
sql/share/spanish/errmsg.txt:
  Auto merged
sql/share/swedish/errmsg.txt:
  Auto merged
sql/share/ukrainian/errmsg.txt:
  Auto merged
sql/ha_myisam.cc:
  Merge with 4.0
  Removed some commented code
sql/sql_db.cc:
  Merge with 4.0
  Optimized the logging of the drop db call a bit
sql/sql_update.cc:
  Added comment

1 files changed, 46 insertions, 30 deletions

diff --git a/.bzrignore b/.bzrignore
index 1f70a9c42c0..278c3de2ee5 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -31,8 +31,11 @@ BitKeeper/etc/gone
 BitKeeper/etc/level
 BitKeeper/etc/pushed
 BitKeeper/tmp/*
+BitKeeper/tmp/bkr3sAHD
+BitKeeper/tmp/gone
 COPYING
 COPYING.LIB
+Docs/#manual.texi#
 Docs/INSTALL-BINARY
 Docs/include.texi
 Docs/internals.info
@@ -73,6 +76,9 @@ PENDING/*
 TAGS
 aclocal.m4
 autom4te.cache/*
+autom4te.cache/output.0
+autom4te.cache/requests
+autom4te.cache/traces.0
 bdb/README
 bdb/btree/btree_auto.c
 bdb/build_unix/*
@@ -81,17 +87,21 @@ bdb/build_vxworks/db_int.h
 bdb/build_win32/db.h
 bdb/build_win32/db_archive.dsp
 bdb/build_win32/db_checkpoint.dsp
+bdb/build_win32/db_config.h
+bdb/build_win32/db_cxx.h
 bdb/build_win32/db_deadlock.dsp
 bdb/build_win32/db_dll.dsp
 bdb/build_win32/db_dump.dsp
 bdb/build_win32/db_int.h
 bdb/build_win32/db_java.dsp
 bdb/build_win32/db_load.dsp
+bdb/build_win32/db_perf.dsp
 bdb/build_win32/db_printlog.dsp
 bdb/build_win32/db_recover.dsp
 bdb/build_win32/db_stat.dsp
 bdb/build_win32/db_static.dsp
 bdb/build_win32/db_tcl.dsp
+bdb/build_win32/db_test.dsp
 bdb/build_win32/db_upgrade.dsp
 bdb/build_win32/db_verify.dsp
 bdb/build_win32/ex_access.dsp
@@ -107,9 +117,16 @@ bdb/build_win32/excxx_lock.dsp
 bdb/build_win32/excxx_mpool.dsp
 bdb/build_win32/excxx_tpcb.dsp
 bdb/build_win32/include.tcl
+bdb/build_win32/libdb.def
 bdb/build_win32/libdb.rc
 bdb/db/crdel_auto.c
 bdb/db/db_auto.c
+bdb/dbinc_auto/*.*
+bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
 bdb/dist/config.hin
 bdb/dist/configure
 bdb/dist/tags
@@ -118,11 +135,17 @@ bdb/dist/template/gen_client_ret
 bdb/dist/template/rec_btree
 bdb/dist/template/rec_crdel
 bdb/dist/template/rec_db
+bdb/dist/template/rec_dbreg
+bdb/dist/template/rec_fileops
 bdb/dist/template/rec_hash
 bdb/dist/template/rec_log
 bdb/dist/template/rec_qam
 bdb/dist/template/rec_txn
+bdb/examples_c/ex_apprec/ex_apprec_auto.c
+bdb/examples_c/ex_apprec/ex_apprec_auto.h
+bdb/examples_c/ex_apprec/ex_apprec_template
 bdb/examples_java
+bdb/fileops/fileops_auto.c
 bdb/hash/hash_auto.c
 bdb/include/btree_auto.h
 bdb/include/btree_ext.h
@@ -151,16 +174,33 @@ bdb/include/tcl_ext.h
 bdb/include/txn_auto.h
 bdb/include/txn_ext.h
 bdb/include/xa_ext.h
+bdb/java/src/com/sleepycat/db/Db.java
+bdb/java/src/com/sleepycat/db/DbBtreeStat.java
 bdb/java/src/com/sleepycat/db/DbConstants.java
+bdb/java/src/com/sleepycat/db/DbHashStat.java
+bdb/java/src/com/sleepycat/db/DbLockStat.java
+bdb/java/src/com/sleepycat/db/DbLogStat.java
+bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+bdb/java/src/com/sleepycat/db/DbQueueStat.java
+bdb/java/src/com/sleepycat/db/DbRepStat.java
+bdb/java/src/com/sleepycat/db/DbTxnStat.java
+bdb/libdb_java/java_stat_auto.c
+bdb/libdb_java/java_stat_auto.h
 bdb/log/log_auto.c
 bdb/qam/qam_auto.c
 bdb/rpc_client/db_server_clnt.c
 bdb/rpc_client/gen_client.c
+bdb/rpc_server/c/db_server_proc.c
+bdb/rpc_server/c/db_server_proc.sed
+bdb/rpc_server/c/db_server_svc.c
+bdb/rpc_server/c/db_server_xdr.c
+bdb/rpc_server/c/gen_db_server.c
 bdb/rpc_server/db_server.x
 bdb/rpc_server/db_server_proc.sed
 bdb/rpc_server/db_server_svc.c
 bdb/rpc_server/db_server_xdr.c
 bdb/rpc_server/gen_db_server.c
+bdb/test/TESTS
 bdb/test/include.tcl
 bdb/test/logtrack.list
 bdb/txn/txn_auto.c
@@ -194,6 +234,7 @@ configure.lineno
 core
 db-*.*.*
 dbug/user.t
+depcomp
 extra/comp_err
 extra/my_print_defaults
 extra/mysql_install
@@ -209,6 +250,9 @@ include/my_global.h
 include/mysql_version.h
 include/widec.h
 innobase/autom4te.cache/*
+innobase/autom4te.cache/output.0
+innobase/autom4te.cache/requests
+innobase/autom4te.cache/traces.0
 innobase/configure.lineno
 innobase/conftest.s1
 innobase/conftest.subs
@@ -392,9 +436,11 @@ mysql.kdevprj
 mysql.proj
 mysqld.S
 mysqld.sym
+mysys/#mf_iocache.c#
 mysys/charset2html
 mysys/getopt.c
 mysys/getopt1.c
+mysys/ste5KbMa
 mysys/test_charset
 mysys/test_dir
 mysys/test_io_cache
@@ -511,33 +557,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-bdb/build_win32/db_config.h
-bdb/build_win32/db_cxx.h
-bdb/build_win32/db_perf.dsp
-bdb/build_win32/db_test.dsp
-bdb/build_win32/libdb.def
-bdb/dbinc_auto/*.*
-bdb/dbreg/dbreg_auto.c
-bdb/dist/template/rec_dbreg
-bdb/dist/template/rec_fileops
-bdb/examples_c/ex_apprec/ex_apprec_auto.c
-bdb/examples_c/ex_apprec/ex_apprec_auto.h
-bdb/examples_c/ex_apprec/ex_apprec_template
-bdb/fileops/fileops_auto.c
-bdb/java/src/com/sleepycat/db/Db.java
-bdb/java/src/com/sleepycat/db/DbBtreeStat.java
-bdb/java/src/com/sleepycat/db/DbHashStat.java
-bdb/java/src/com/sleepycat/db/DbLockStat.java
-bdb/java/src/com/sleepycat/db/DbLogStat.java
-bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
-bdb/java/src/com/sleepycat/db/DbQueueStat.java
-bdb/java/src/com/sleepycat/db/DbRepStat.java
-bdb/java/src/com/sleepycat/db/DbTxnStat.java
-bdb/libdb_java/java_stat_auto.c
-bdb/libdb_java/java_stat_auto.h
-bdb/rpc_server/c/db_server_proc.c
-bdb/rpc_server/c/db_server_proc.sed
-bdb/rpc_server/c/db_server_svc.c
-bdb/rpc_server/c/db_server_xdr.c
-bdb/rpc_server/c/gen_db_server.c
-bdb/test/TESTS