Merge

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union

1 files changed, 47 insertions, 45 deletions

diff --git a/.bzrignore b/.bzrignore
index a24e77758eb..c58c5a69f04 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -51,6 +51,7 @@ Docs/manual_toc.html
 Docs/my_sys.doc
 Docs/mysql.info
 INSTALL-SOURCE
+Logs/*
 MIRRORS
 Makefile
 Makefile.in
@@ -59,11 +60,47 @@ PENDING/*
 TAGS
 aclocal.m4
 bdb/README
+bdb/btree/btree_auto.c
 bdb/build_unix/*
 bdb/build_vxworks/db.h
+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_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_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_upgrade.dsp
+bdb/build_win32/db_verify.dsp
+bdb/build_win32/ex_access.dsp
+bdb/build_win32/ex_btrec.dsp
+bdb/build_win32/ex_env.dsp
+bdb/build_win32/ex_lock.dsp
+bdb/build_win32/ex_mpool.dsp
+bdb/build_win32/ex_tpcb.dsp
+bdb/build_win32/excxx_access.dsp
+bdb/build_win32/excxx_btrec.dsp
+bdb/build_win32/excxx_env.dsp
+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.rc
+bdb/db/crdel_auto.c
+bdb/db/db_auto.c
+bdb/dist/config.hin
 bdb/dist/configure
 bdb/dist/tags
+bdb/dist/template/db_server_proc
+bdb/dist/template/gen_client_ret
 bdb/dist/template/rec_btree
 bdb/dist/template/rec_crdel
 bdb/dist/template/rec_db
@@ -77,6 +114,8 @@ bdb/include/btree_auto.h
 bdb/include/crdel_auto.h
 bdb/include/db_auto.h
 bdb/include/db_server.h
+bdb/include/gen_client_ext.h
+bdb/include/gen_server_ext.h
 bdb/include/hash_auto.h
 bdb/include/log_auto.h
 bdb/include/qam_auto.h
@@ -86,14 +125,19 @@ 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/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/include.tcl
+bdb/test/logtrack.list
 bdb/txn/txn_auto.c
+binary/*
 client/insert_test
 client/mysql
 client/mysqladmin
+client/mysqlcheck
 client/mysqldump
 client/mysqlimport
 client/mysqlshow
@@ -122,6 +166,8 @@ heap/hp_test2
 include/my_config.h
 include/my_global.h
 include/mysql_version.h
+innobase/ib_config.h
+innobase/ib_config.h.in
 isam/isamchk
 isam/isamlog
 isam/pack_isam
@@ -159,6 +205,7 @@ mysql-test/mysql-test-run
 mysql-test/r/*.reject
 mysql-test/share/mysql
 mysql-test/var/*
+mysql.proj
 mysqld.S
 mysqld.sym
 mysys/test_charset
@@ -236,48 +283,3 @@ support-files/mysql.server
 support-files/mysql.spec
 tags
 tmp/*
-bdb/btree/btree_auto.c
-bdb/build_vxworks/db_int.h
-bdb/build_win32/db_int.h
-bdb/build_win32/include.tcl
-bdb/build_win32/libdb.rc
-bdb/db/crdel_auto.c
-bdb/db/db_auto.c
-bdb/dist/config.hin
-innobase/ib_config.h
-innobase/ib_config.h.in
-mysql.proj
-client/mysqlcheck
-bdb/build_win32/db_archive.dsp
-bdb/build_win32/db_checkpoint.dsp
-bdb/build_win32/db_deadlock.dsp
-bdb/build_win32/db_dump.dsp
-bdb/build_win32/db_load.dsp
-bdb/build_win32/db_printlog.dsp
-bdb/build_win32/db_recover.dsp
-bdb/build_win32/db_stat.dsp
-bdb/build_win32/db_upgrade.dsp
-bdb/build_win32/db_verify.dsp
-bdb/build_win32/ex_access.dsp
-bdb/build_win32/ex_btrec.dsp
-bdb/build_win32/ex_env.dsp
-bdb/build_win32/ex_lock.dsp
-bdb/build_win32/ex_mpool.dsp
-bdb/build_win32/ex_tpcb.dsp
-bdb/build_win32/excxx_access.dsp
-bdb/build_win32/excxx_btrec.dsp
-bdb/build_win32/excxx_env.dsp
-bdb/build_win32/excxx_lock.dsp
-bdb/build_win32/excxx_mpool.dsp
-bdb/build_win32/excxx_tpcb.dsp
-bdb/build_win32/db_dll.dsp
-bdb/build_win32/db_java.dsp
-bdb/build_win32/db_static.dsp
-bdb/build_win32/db_tcl.dsp
-bdb/dist/template/gen_client_ret
-bdb/dist/template/db_server_proc
-bdb/include/gen_client_ext.h
-bdb/include/gen_server_ext.h
-bdb/rpc_server/db_server_proc.sed
-bdb/rpc_server/db_server.x
-bdb/test/logtrack.list