Merge work:/home/bk/mysql-4.0

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


BitKeeper/etc/ignore:
  auto-union
sql/mysqld.cc:
  Auto merged

1 files changed, 18 insertions, 16 deletions

diff --git a/.bzrignore b/.bzrignore
index 41303ef4ba6..56094cd2e78 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -120,17 +120,32 @@ bdb/dist/template/rec_txn
 bdb/examples_java
 bdb/hash/hash_auto.c
 bdb/include/btree_auto.h
+bdb/include/btree_ext.h
+bdb/include/clib_ext.h
+bdb/include/common_ext.h
 bdb/include/crdel_auto.h
 bdb/include/db_auto.h
+bdb/include/db_ext.h
 bdb/include/db_server.h
+bdb/include/env_ext.h
 bdb/include/gen_client_ext.h
 bdb/include/gen_server_ext.h
 bdb/include/hash_auto.h
+bdb/include/hash_ext.h
+bdb/include/lock_ext.h
 bdb/include/log_auto.h
+bdb/include/log_ext.h
+bdb/include/mp_ext.h
+bdb/include/mutex_ext.h
+bdb/include/os_ext.h
 bdb/include/qam_auto.h
+bdb/include/qam_ext.h
 bdb/include/rpc_client_ext.h
 bdb/include/rpc_server_ext.h
+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/DbConstants.java
 bdb/log/log_auto.c
 bdb/qam/qam_auto.c
@@ -250,6 +265,7 @@ libmysqld/lock.cc
 libmysqld/log.cc
 libmysqld/log_event.cc
 libmysqld/md5.c
+libmysqld/mf_iocache.cc
 libmysqld/mini_client.cc
 libmysqld/net_pkg.cc
 libmysqld/net_serv.cc
@@ -332,8 +348,10 @@ mysql.kdevprj
 mysql.proj
 mysqld.S
 mysqld.sym
+mysys/#mf_iocache.c#
 mysys/test_charset
 mysys/test_dir
+mysys/test_io_cache
 mysys/test_thr_alarm
 mysys/test_thr_lock
 mysys/testhash
@@ -424,19 +442,3 @@ vio/test-ssl
 vio/test-sslclient
 vio/test-sslserver
 vio/viotest-ssl
-libmysqld/mf_iocache.cc
-bdb/include/btree_ext.h
-bdb/include/clib_ext.h
-bdb/include/common_ext.h
-bdb/include/db_ext.h
-bdb/include/env_ext.h
-bdb/include/hash_ext.h
-bdb/include/lock_ext.h
-bdb/include/log_ext.h
-bdb/include/mp_ext.h
-bdb/include/mutex_ext.h
-bdb/include/os_ext.h
-bdb/include/qam_ext.h
-bdb/include/tcl_ext.h
-bdb/include/txn_ext.h
-bdb/include/xa_ext.h