1. 16 Aug, 2006 2 commits
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · d03b17b9
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      d03b17b9
    • unknown's avatar
      Cheery picked Antony's patch to allow for Window's builds in 5.1 · 2a565179
      unknown authored
      
      BitKeeper/deleted/.del-bt_compact.c:
        Delete: storage/bdb/btree/bt_compact.c
      BitKeeper/deleted/.del-bt_compare.c:
        Delete: storage/bdb/btree/bt_compare.c
      BitKeeper/deleted/.del-bt_conv.c:
        Delete: storage/bdb/btree/bt_conv.c
      BitKeeper/deleted/.del-bt_curadj.c:
        Delete: storage/bdb/btree/bt_curadj.c
      BitKeeper/deleted/.del-bt_cursor.c:
        Delete: storage/bdb/btree/bt_cursor.c
      BitKeeper/deleted/.del-bt_delete.c:
        Delete: storage/bdb/btree/bt_delete.c
      BitKeeper/deleted/.del-bt_method.c:
        Delete: storage/bdb/btree/bt_method.c
      BitKeeper/deleted/.del-bt_open.c:
        Delete: storage/bdb/btree/bt_open.c
      BitKeeper/deleted/.del-bt_put.c:
        Delete: storage/bdb/btree/bt_put.c
      BitKeeper/deleted/.del-bt_rec.c:
        Delete: storage/bdb/btree/bt_rec.c
      BitKeeper/deleted/.del-bt_reclaim.c:
        Delete: storage/bdb/btree/bt_reclaim.c
      BitKeeper/deleted/.del-bt_recno.c:
        Delete: storage/bdb/btree/bt_recno.c
      BitKeeper/deleted/.del-bt_rsearch.c:
        Delete: storage/bdb/btree/bt_rsearch.c
      BitKeeper/deleted/.del-bt_search.c:
        Delete: storage/bdb/btree/bt_search.c
      BitKeeper/deleted/.del-bt_split.c:
        Delete: storage/bdb/btree/bt_split.c
      BitKeeper/deleted/.del-bt_stat.c:
        Delete: storage/bdb/btree/bt_stat.c
      BitKeeper/deleted/.del-.IGNORE_ME:
        Delete: storage/bdb/build_unix/.IGNORE_ME
      BitKeeper/deleted/.del-Berkeley_DB.dsw:
        Delete: storage/bdb/build_win32/Berkeley_DB.dsw
      BitKeeper/deleted/.del-app_dsp.src:
        Delete: storage/bdb/build_win32/app_dsp.src
      BitKeeper/deleted/.del-app_dsp.src~dcf703e0c9c72e4a:
        Delete: storage/bdb/build_win64/app_dsp.src
      BitKeeper/deleted/.del-bt_upgrade.c:
        Delete: storage/bdb/btree/bt_upgrade.c
      BitKeeper/deleted/.del-bt_verify.c:
        Delete: storage/bdb/btree/bt_verify.c
      BitKeeper/deleted/.del-btree.src:
        Delete: storage/bdb/btree/btree.src
      BitKeeper/deleted/.del-db_java_xaj.mak:
        Delete: storage/bdb/build_win32/db_java_xaj.mak
      BitKeeper/deleted/.del-db_test.src:
        Delete: storage/bdb/build_win32/db_test.src
      BitKeeper/deleted/.del-dbkill.cpp:
        Delete: storage/bdb/build_win32/dbkill.cpp
      BitKeeper/deleted/.del-dllmain.c:
        Delete: storage/bdb/build_win32/dllmain.c
      BitKeeper/deleted/.del-dynamic_dsp.src:
        Delete: storage/bdb/build_win32/dynamic_dsp.src
      BitKeeper/deleted/.del-java_dsp.src:
        Delete: storage/bdb/build_win32/java_dsp.src
      BitKeeper/deleted/.del-libdb_tcl.def:
        Delete: storage/bdb/build_win32/libdb_tcl.def
      BitKeeper/deleted/.del-libdbrc.src:
        Delete: storage/bdb/build_win32/libdbrc.src
      BitKeeper/deleted/.del-small_dsp.src:
        Delete: storage/bdb/build_win32/small_dsp.src
      BitKeeper/deleted/.del-srcfile_dsp.src:
        Delete: storage/bdb/build_win32/srcfile_dsp.src
      BitKeeper/deleted/.del-static_dsp.src:
        Delete: storage/bdb/build_win32/static_dsp.src
      BitKeeper/deleted/.del-tcl_dsp.src:
        Delete: storage/bdb/build_win32/tcl_dsp.src
      BitKeeper/deleted/.del-db_test.src~2521827764f86c53:
        Delete: storage/bdb/build_win64/db_test.src
      BitKeeper/deleted/.del-dynamic_dsp.src~95360632a65b4e62:
        Delete: storage/bdb/build_win64/dynamic_dsp.src
      BitKeeper/deleted/.del-ex_repquote.src:
        Delete: storage/bdb/build_win64/ex_repquote.src
      BitKeeper/deleted/.del-getcwd.c:
        Delete: storage/bdb/clib/getcwd.c
      BitKeeper/deleted/.del-getopt.c:
        Delete: storage/bdb/clib/getopt.c
      BitKeeper/deleted/.del-java_dsp.src~e42f32427327f5b5:
        Delete: storage/bdb/build_win64/java_dsp.src
      BitKeeper/deleted/.del-libdbrc.src~d22fea70774c5e98:
        Delete: storage/bdb/build_win64/libdbrc.src
      BitKeeper/deleted/.del-memcmp.c:
        Delete: storage/bdb/clib/memcmp.c
      BitKeeper/deleted/.del-memmove.c:
        Delete: storage/bdb/clib/memmove.c
      BitKeeper/deleted/.del-raise.c:
        Delete: storage/bdb/clib/raise.c
      BitKeeper/deleted/.del-small_dsp.src~96bb604dd8041058:
        Delete: storage/bdb/build_win64/small_dsp.src
      BitKeeper/deleted/.del-snprintf.c:
        Delete: storage/bdb/clib/snprintf.c
      BitKeeper/deleted/.del-srcfile_dsp.src~45382c1414b89bb1:
        Delete: storage/bdb/build_win64/srcfile_dsp.src
      BitKeeper/deleted/.del-static_dsp.src~3f1945d094870d53:
        Delete: storage/bdb/build_win64/static_dsp.src
      BitKeeper/deleted/.del-strcasecmp.c:
        Delete: storage/bdb/clib/strcasecmp.c
      BitKeeper/deleted/.del-strdup.c:
        Delete: storage/bdb/clib/strdup.c
      BitKeeper/deleted/.del-strerror.c:
        Delete: storage/bdb/clib/strerror.c
      BitKeeper/deleted/.del-strtol.c:
        Delete: storage/bdb/clib/strtol.c
      BitKeeper/deleted/.del-tcl_dsp.src~7fd8c5914db07070:
        Delete: storage/bdb/build_win64/tcl_dsp.src
      BitKeeper/deleted/.del-aes_method.c:
        Delete: storage/bdb/crypto/aes_method.c
      BitKeeper/deleted/.del-crypto.c:
        Delete: storage/bdb/crypto/crypto.c
      BitKeeper/deleted/.del-crypto.html:
        Delete: storage/bdb/crypto/crypto.html
      BitKeeper/deleted/.del-crypto_stub.c:
        Delete: storage/bdb/common/crypto_stub.c
      BitKeeper/deleted/.del-db_byteorder.c:
        Delete: storage/bdb/common/db_byteorder.c
      BitKeeper/deleted/.del-db_clock.c:
        Delete: storage/bdb/common/db_clock.c
      BitKeeper/deleted/.del-db_err.c:
        Delete: storage/bdb/common/db_err.c
      BitKeeper/deleted/.del-db_getlong.c:
        Delete: storage/bdb/common/db_getlong.c
      BitKeeper/deleted/.del-db_idspace.c:
        Delete: storage/bdb/common/db_idspace.c
      BitKeeper/deleted/.del-db_log2.c:
        Delete: storage/bdb/common/db_log2.c
      BitKeeper/deleted/.del-mt19937db.c:
        Delete: storage/bdb/crypto/mersenne/mt19937db.c
      BitKeeper/deleted/.del-rijndael-alg-fst.c:
        Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.c
      BitKeeper/deleted/.del-rijndael-alg-fst.h:
        Delete: storage/bdb/crypto/rijndael/rijndael-alg-fst.h
      BitKeeper/deleted/.del-strtoul.c:
        Delete: storage/bdb/clib/strtoul.c
      BitKeeper/deleted/.del-util_arg.c:
        Delete: storage/bdb/common/util_arg.c
      BitKeeper/deleted/.del-util_cache.c:
        Delete: storage/bdb/common/util_cache.c
      BitKeeper/deleted/.del-util_log.c:
        Delete: storage/bdb/common/util_log.c
      BitKeeper/deleted/.del-util_sig.c:
        Delete: storage/bdb/common/util_sig.c
      BitKeeper/deleted/.del-vsnprintf.c:
        Delete: storage/bdb/clib/vsnprintf.c
      BitKeeper/deleted/.del-crdel.src:
        Delete: storage/bdb/db/crdel.src
      BitKeeper/deleted/.del-crdel_rec.c:
        Delete: storage/bdb/db/crdel_rec.c
      BitKeeper/deleted/.del-cxx_db.cpp:
        Delete: storage/bdb/cxx/cxx_db.cpp
      BitKeeper/deleted/.del-cxx_dbc.cpp:
        Delete: storage/bdb/cxx/cxx_dbc.cpp
      BitKeeper/deleted/.del-cxx_dbt.cpp:
        Delete: storage/bdb/cxx/cxx_dbt.cpp
      BitKeeper/deleted/.del-cxx_env.cpp:
        Delete: storage/bdb/cxx/cxx_env.cpp
      BitKeeper/deleted/.del-cxx_except.cpp:
        Delete: storage/bdb/cxx/cxx_except.cpp
      BitKeeper/deleted/.del-cxx_lock.cpp:
        Delete: storage/bdb/cxx/cxx_lock.cpp
      BitKeeper/deleted/.del-cxx_logc.cpp:
        Delete: storage/bdb/cxx/cxx_logc.cpp
      BitKeeper/deleted/.del-cxx_mpool.cpp:
        Delete: storage/bdb/cxx/cxx_mpool.cpp
      BitKeeper/deleted/.del-cxx_multi.cpp:
        Delete: storage/bdb/cxx/cxx_multi.cpp
      BitKeeper/deleted/.del-cxx_seq.cpp:
        Delete: storage/bdb/cxx/cxx_seq.cpp
      BitKeeper/deleted/.del-cxx_txn.cpp:
        Delete: storage/bdb/cxx/cxx_txn.cpp
      BitKeeper/deleted/.del-db.c:
        Delete: storage/bdb/db/db.c
      BitKeeper/deleted/.del-rijndael-api-fst.c:
        Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.c
      BitKeeper/deleted/.del-rijndael-api-fst.h:
        Delete: storage/bdb/crypto/rijndael/rijndael-api-fst.h
      BitKeeper/deleted/.del-db.src:
        Delete: storage/bdb/db/db.src
      BitKeeper/deleted/.del-db_am.c:
        Delete: storage/bdb/db/db_am.c
      BitKeeper/deleted/.del-db_cam.c:
        Delete: storage/bdb/db/db_cam.c
      BitKeeper/deleted/.del-db_conv.c:
        Delete: storage/bdb/db/db_conv.c
      BitKeeper/deleted/.del-db_dispatch.c:
        Delete: storage/bdb/db/db_dispatch.c
      BitKeeper/deleted/.del-db_dup.c:
        Delete: storage/bdb/db/db_dup.c
      BitKeeper/deleted/.del-db_iface.c:
        Delete: storage/bdb/db/db_iface.c
      BitKeeper/deleted/.del-db_join.c:
        Delete: storage/bdb/db/db_join.c
      BitKeeper/deleted/.del-db_meta.c:
        Delete: storage/bdb/db/db_meta.c
      BitKeeper/deleted/.del-db_method.c:
        Delete: storage/bdb/db/db_method.c
      BitKeeper/deleted/.del-db_open.c:
        Delete: storage/bdb/db/db_open.c
      BitKeeper/deleted/.del-db_overflow.c:
        Delete: storage/bdb/db/db_overflow.c
      BitKeeper/deleted/.del-db_ovfl_vrfy.c:
        Delete: storage/bdb/db/db_ovfl_vrfy.c
      BitKeeper/deleted/.del-db_pr.c:
        Delete: storage/bdb/db/db_pr.c
      BitKeeper/deleted/.del-db_rec.c:
        Delete: storage/bdb/db/db_rec.c
      BitKeeper/deleted/.del-db_reclaim.c:
        Delete: storage/bdb/db/db_reclaim.c
      BitKeeper/deleted/.del-db_remove.c:
        Delete: storage/bdb/db/db_remove.c
      BitKeeper/deleted/.del-db_rename.c:
        Delete: storage/bdb/db/db_rename.c
      BitKeeper/deleted/.del-db_ret.c:
        Delete: storage/bdb/db/db_ret.c
      BitKeeper/deleted/.del-db185.c:
        Delete: storage/bdb/db185/db185.c
      BitKeeper/deleted/.del-db185_int.in:
        Delete: storage/bdb/db185/db185_int.in
      BitKeeper/deleted/.del-db_archive.c:
        Delete: storage/bdb/db_archive/db_archive.c
      BitKeeper/deleted/.del-db_checkpoint.c:
        Delete: storage/bdb/db_checkpoint/db_checkpoint.c
      BitKeeper/deleted/.del-db_deadlock.c:
        Delete: storage/bdb/db_deadlock/db_deadlock.c
      BitKeeper/deleted/.del-db_dump.c:
        Delete: storage/bdb/db_dump/db_dump.c
      BitKeeper/deleted/.del-db_dump185.c:
        Delete: storage/bdb/db_dump185/db_dump185.c
      BitKeeper/deleted/.del-db_hotbackup.c:
        Delete: storage/bdb/db_hotbackup/db_hotbackup.c
      BitKeeper/deleted/.del-db_load.c:
        Delete: storage/bdb/db_load/db_load.c
      BitKeeper/deleted/.del-db_setid.c:
        Delete: storage/bdb/db/db_setid.c
      BitKeeper/deleted/.del-db_setlsn.c:
        Delete: storage/bdb/db/db_setlsn.c
      BitKeeper/deleted/.del-db_stati.c:
        Delete: storage/bdb/db/db_stati.c
      BitKeeper/deleted/.del-db_truncate.c:
        Delete: storage/bdb/db/db_truncate.c
      BitKeeper/deleted/.del-db_upg.c:
        Delete: storage/bdb/db/db_upg.c
      BitKeeper/deleted/.del-db_upg_opd.c:
        Delete: storage/bdb/db/db_upg_opd.c
      BitKeeper/deleted/.del-db_vrfy.c:
        Delete: storage/bdb/db/db_vrfy.c
      BitKeeper/deleted/.del-db_vrfy_stub.c:
        Delete: storage/bdb/db/db_vrfy_stub.c
      BitKeeper/deleted/.del-db_vrfyutil.c:
        Delete: storage/bdb/db/db_vrfyutil.c
      BitKeeper/deleted/.del-README:
        Delete: storage/bdb/db_printlog/README
      BitKeeper/deleted/.del-btree.h:
        Delete: storage/bdb/dbinc/btree.h
      BitKeeper/deleted/.del-commit.awk:
        Delete: storage/bdb/db_printlog/commit.awk
      BitKeeper/deleted/.del-count.awk:
        Delete: storage/bdb/db_printlog/count.awk
      BitKeeper/deleted/.del-db_printlog.c:
        Delete: storage/bdb/db_printlog/db_printlog.c
      BitKeeper/deleted/.del-db_recover.c:
        Delete: storage/bdb/db_recover/db_recover.c
      BitKeeper/deleted/.del-db_stat.c:
        Delete: storage/bdb/db_stat/db_stat.c
      BitKeeper/deleted/.del-db_upgrade.c:
        Delete: storage/bdb/db_upgrade/db_upgrade.c
      BitKeeper/deleted/.del-db_verify.c:
        Delete: storage/bdb/db_verify/db_verify.c
      BitKeeper/deleted/.del-dbname.awk:
        Delete: storage/bdb/db_printlog/dbname.awk
      BitKeeper/deleted/.del-dd.sh:
        Delete: storage/bdb/db_stat/dd.sh
      BitKeeper/deleted/.del-fileid.awk:
        Delete: storage/bdb/db_printlog/fileid.awk
      BitKeeper/deleted/.del-logstat.awk:
        Delete: storage/bdb/db_printlog/logstat.awk
      BitKeeper/deleted/.del-pgno.awk:
        Delete: storage/bdb/db_printlog/pgno.awk
      BitKeeper/deleted/.del-range.awk:
        Delete: storage/bdb/db_printlog/range.awk
      BitKeeper/deleted/.del-rectype.awk:
        Delete: storage/bdb/db_printlog/rectype.awk
      BitKeeper/deleted/.del-status.awk:
        Delete: storage/bdb/db_printlog/status.awk
      BitKeeper/deleted/.del-txn.awk:
        Delete: storage/bdb/db_printlog/txn.awk
      BitKeeper/deleted/.del-crypto.h:
        Delete: storage/bdb/dbinc/crypto.h
      BitKeeper/deleted/.del-cxx_common.h:
        Delete: storage/bdb/dbinc/cxx_common.h
      BitKeeper/deleted/.del-cxx_except.h:
        Delete: storage/bdb/dbinc/cxx_except.h
      BitKeeper/deleted/.del-cxx_int.h:
        Delete: storage/bdb/dbinc/cxx_int.h
      BitKeeper/deleted/.del-db.in:
        Delete: storage/bdb/dbinc/db.in
      BitKeeper/deleted/.del-db_185.in:
        Delete: storage/bdb/dbinc/db_185.in
      BitKeeper/deleted/.del-db_am.h:
        Delete: storage/bdb/dbinc/db_am.h
      BitKeeper/deleted/.del-db_cxx.in:
        Delete: storage/bdb/dbinc/db_cxx.in
      BitKeeper/deleted/.del-db_dispatch.h:
        Delete: storage/bdb/dbinc/db_dispatch.h
      BitKeeper/deleted/.del-db_int.in:
        Delete: storage/bdb/dbinc/db_int.in
      BitKeeper/deleted/.del-db_join.h:
        Delete: storage/bdb/dbinc/db_join.h
      BitKeeper/deleted/.del-db_page.h:
        Delete: storage/bdb/dbinc/db_page.h
      BitKeeper/deleted/.del-db_server_int.h:
        Delete: storage/bdb/dbinc/db_server_int.h
      BitKeeper/deleted/.del-db_shash.h:
        Delete: storage/bdb/dbinc/db_shash.h
      BitKeeper/deleted/.del-db_swap.h:
        Delete: storage/bdb/dbinc/db_swap.h
      BitKeeper/deleted/.del-db_upgrade.h:
        Delete: storage/bdb/dbinc/db_upgrade.h
      BitKeeper/deleted/.del-db_verify.h:
        Delete: storage/bdb/dbinc/db_verify.h
      BitKeeper/deleted/.del-debug.h:
        Delete: storage/bdb/dbinc/debug.h
      BitKeeper/deleted/.del-fop.h:
        Delete: storage/bdb/dbinc/fop.h
      BitKeeper/deleted/.del-globals.h:
        Delete: storage/bdb/dbinc/globals.h
      BitKeeper/deleted/.del-hash.h:
        Delete: storage/bdb/dbinc/hash.h
      BitKeeper/deleted/.del-hmac.h:
        Delete: storage/bdb/dbinc/hmac.h
      BitKeeper/deleted/.del-lock.h:
        Delete: storage/bdb/dbinc/lock.h
      BitKeeper/deleted/.del-log.h:
        Delete: storage/bdb/dbinc/log.h
      BitKeeper/deleted/.del-mp.h:
        Delete: storage/bdb/dbinc/mp.h
      BitKeeper/deleted/.del-mutex.h:
        Delete: storage/bdb/dbinc/mutex.h
      BitKeeper/deleted/.del-mutex_int.h:
        Delete: storage/bdb/dbinc/mutex_int.h
      BitKeeper/deleted/.del-os.h:
        Delete: storage/bdb/dbinc/os.h
      BitKeeper/deleted/.del-qam.h:
        Delete: storage/bdb/dbinc/qam.h
      BitKeeper/deleted/.del-queue.h:
        Delete: storage/bdb/dbinc/queue.h
      BitKeeper/deleted/.del-region.h:
        Delete: storage/bdb/dbinc/region.h
      BitKeeper/deleted/.del-rep.h:
        Delete: storage/bdb/dbinc/rep.h
      BitKeeper/deleted/.del-shqueue.h:
        Delete: storage/bdb/dbinc/shqueue.h
      BitKeeper/deleted/.del-tcl_db.h:
        Delete: storage/bdb/dbinc/tcl_db.h
      BitKeeper/deleted/.del-txn.h:
        Delete: storage/bdb/dbinc/txn.h
      BitKeeper/deleted/.del-xa.h:
        Delete: storage/bdb/dbinc/xa.h
      BitKeeper/deleted/.del-.empty:
        Delete: storage/bdb/dbinc_auto/.empty
      BitKeeper/deleted/.del-Makefile.in~c0ea38ee72675ab4:
        Delete: storage/bdb/dist/Makefile.in
      BitKeeper/deleted/.del-RELEASE:
        Delete: storage/bdb/dist/RELEASE
      BitKeeper/deleted/.del-buildrel:
        Delete: storage/bdb/dist/buildrel
      BitKeeper/deleted/.del-config.guess:
        Delete: storage/bdb/dist/config.guess
      BitKeeper/deleted/.del-config.sub:
        Delete: storage/bdb/dist/config.sub
      BitKeeper/deleted/.del-configure.ac:
        Delete: storage/bdb/dist/configure.ac
      BitKeeper/deleted/.del-db.ecd.in:
        Delete: storage/bdb/dist/db.ecd.in
      BitKeeper/deleted/.del-db.spec.in:
        Delete: storage/bdb/dist/db.spec.in
      BitKeeper/deleted/.del-dbm.c:
        Delete: storage/bdb/dbm/dbm.c
      BitKeeper/deleted/.del-dbreg.c:
        Delete: storage/bdb/dbreg/dbreg.c
      BitKeeper/deleted/.del-dbreg.src:
        Delete: storage/bdb/dbreg/dbreg.src
      BitKeeper/deleted/.del-dbreg_rec.c:
        Delete: storage/bdb/dbreg/dbreg_rec.c
      BitKeeper/deleted/.del-dbreg_stat.c:
        Delete: storage/bdb/dbreg/dbreg_stat.c
      BitKeeper/deleted/.del-dbreg_util.c:
        Delete: storage/bdb/dbreg/dbreg_util.c
      BitKeeper/deleted/.del-gen_inc.awk:
        Delete: storage/bdb/dist/gen_inc.awk
      BitKeeper/deleted/.del-gen_rec.awk:
        Delete: storage/bdb/dist/gen_rec.awk
      BitKeeper/deleted/.del-gen_rpc.awk:
        Delete: storage/bdb/dist/gen_rpc.awk
      BitKeeper/deleted/.del-install-sh:
        Delete: storage/bdb/dist/install-sh
      BitKeeper/deleted/.del-ltmain.sh:
        Delete: storage/bdb/dist/ltmain.sh
      BitKeeper/deleted/.del-pubdef.in:
        Delete: storage/bdb/dist/pubdef.in
      BitKeeper/deleted/.del-s_all:
        Delete: storage/bdb/dist/s_all
      BitKeeper/deleted/.del-s_config:
        Delete: storage/bdb/dist/s_config
      BitKeeper/deleted/.del-s_crypto:
        Delete: storage/bdb/dist/s_crypto
      BitKeeper/deleted/.del-s_dir:
        Delete: storage/bdb/dist/s_dir
      BitKeeper/deleted/.del-s_include:
        Delete: storage/bdb/dist/s_include
      BitKeeper/deleted/.del-s_java_const:
        Delete: storage/bdb/dist/s_java_const
      BitKeeper/deleted/.del-s_java_stat:
        Delete: storage/bdb/dist/s_java_stat
      BitKeeper/deleted/.del-s_java_swig:
        Delete: storage/bdb/dist/s_java_swig
      BitKeeper/deleted/.del-s_javah:
        Delete: storage/bdb/dist/s_javah
      BitKeeper/deleted/.del-s_java:
        Delete: storage/bdb/dist/s_java
      BitKeeper/deleted/.del-s_je2db:
        Delete: storage/bdb/dist/s_je2db
      BitKeeper/deleted/.del-s_perm:
        Delete: storage/bdb/dist/s_perm
      BitKeeper/deleted/.del-s_readme:
        Delete: storage/bdb/dist/s_readme
      BitKeeper/deleted/.del-s_recover:
        Delete: storage/bdb/dist/s_recover
      BitKeeper/deleted/.del-s_rpc:
        Delete: storage/bdb/dist/s_rpc
      BitKeeper/deleted/.del-s_symlink:
        Delete: storage/bdb/dist/s_symlink
      BitKeeper/deleted/.del-config.ac:
        Delete: storage/bdb/dist/aclocal/config.ac
      BitKeeper/deleted/.del-cxx.ac:
        Delete: storage/bdb/dist/aclocal/cxx.ac
      BitKeeper/deleted/.del-gcc.ac:
        Delete: storage/bdb/dist/aclocal/gcc.ac
      BitKeeper/deleted/.del-libtool.ac:
        Delete: storage/bdb/dist/aclocal/libtool.ac
      BitKeeper/deleted/.del-mutex.ac:
        Delete: storage/bdb/dist/aclocal/mutex.ac
      BitKeeper/deleted/.del-options.ac:
        Delete: storage/bdb/dist/aclocal/options.ac
      BitKeeper/deleted/.del-programs.ac:
        Delete: storage/bdb/dist/aclocal/programs.ac
      BitKeeper/deleted/.del-s_tags:
        Delete: storage/bdb/dist/s_tags
      BitKeeper/deleted/.del-s_test:
        Delete: storage/bdb/dist/s_test
      BitKeeper/deleted/.del-s_vxworks:
        Delete: storage/bdb/dist/s_vxworks
      BitKeeper/deleted/.del-s_win32_dsp:
        Delete: storage/bdb/dist/s_win32_dsp
      BitKeeper/deleted/.del-s_win32:
        Delete: storage/bdb/dist/s_win32
      BitKeeper/deleted/.del-s_winmsi:
        Delete: storage/bdb/dist/s_winmsi
      BitKeeper/deleted/.del-srcfiles.in:
        Delete: storage/bdb/dist/srcfiles.in
      BitKeeper/deleted/.del-vx_buildcd:
        Delete: storage/bdb/dist/vx_buildcd
      BitKeeper/deleted/.del-vx_config.in:
        Delete: storage/bdb/dist/vx_config.in
      BitKeeper/deleted/.del-win_config.in:
        Delete: storage/bdb/dist/win_config.in
      BitKeeper/deleted/.del-win_db.in:
        Delete: storage/bdb/dist/win_db.in
      BitKeeper/deleted/.del-win_exports.in:
        Delete: storage/bdb/dist/win_exports.in
      BitKeeper/deleted/.del-ac_check_class.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_check_class.ac
      BitKeeper/deleted/.del-ac_check_classpath.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_check_classpath.ac
      BitKeeper/deleted/.del-ac_check_junit.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_check_junit.ac
      BitKeeper/deleted/.del-ac_check_rqrd_class.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_check_rqrd_class.ac
      BitKeeper/deleted/.del-ac_java_options.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_java_options.ac
      BitKeeper/deleted/.del-ac_jni_include_dirs.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_jni_include_dirs.ac
      BitKeeper/deleted/.del-ac_prog_jar.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_jar.ac
      BitKeeper/deleted/.del-ac_prog_java.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_java.ac
      BitKeeper/deleted/.del-ac_prog_java_works.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_java_works.ac
      BitKeeper/deleted/.del-ac_prog_javac.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_javac.ac
      BitKeeper/deleted/.del-ac_prog_javac_works.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_javac_works.ac
      BitKeeper/deleted/.del-ac_prog_javadoc.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_javadoc.ac
      BitKeeper/deleted/.del-ac_prog_javah.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_prog_javah.ac
      BitKeeper/deleted/.del-rpc.ac:
        Delete: storage/bdb/dist/aclocal/rpc.ac
      BitKeeper/deleted/.del-sequence.ac:
        Delete: storage/bdb/dist/aclocal/sequence.ac
      BitKeeper/deleted/.del-sosuffix.ac:
        Delete: storage/bdb/dist/aclocal/sosuffix.ac
      BitKeeper/deleted/.del-tcl.ac:
        Delete: storage/bdb/dist/aclocal/tcl.ac
      BitKeeper/deleted/.del-types.ac:
        Delete: storage/bdb/dist/aclocal/types.ac
      BitKeeper/deleted/.del-BerkeleyDB.wpj:
        Delete: storage/bdb/dist/vx_2.0/BerkeleyDB.wpj
      BitKeeper/deleted/.del-BerkeleyDB.wpj~320150f7956cd770:
        Delete: storage/bdb/dist/vx_2.2/BerkeleyDB.wpj
      BitKeeper/deleted/.del-BerkeleyDBsmall.wpj:
        Delete: storage/bdb/dist/vx_2.0/BerkeleyDBsmall.wpj
      BitKeeper/deleted/.del-BerkeleyDBsmall.wpj~4c4d7f40dbf1664d:
        Delete: storage/bdb/dist/vx_2.2/BerkeleyDBsmall.wpj
      BitKeeper/deleted/.del-Makefile.custom:
        Delete: storage/bdb/dist/vx_3.1/Makefile.custom
      BitKeeper/deleted/.del-ac_try_compile_java.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_try_compile_java.ac
      BitKeeper/deleted/.del-ac_try_run_javac.ac:
        Delete: storage/bdb/dist/aclocal_java/ac_try_run_javac.ac
      BitKeeper/deleted/.del-cdf.1:
        Delete: storage/bdb/dist/vx_3.1/cdf.1
      BitKeeper/deleted/.del-cdf.2:
        Delete: storage/bdb/dist/vx_3.1/cdf.2
      BitKeeper/deleted/.del-cdf.3:
        Delete: storage/bdb/dist/vx_3.1/cdf.3
      BitKeeper/deleted/.del-component.cdf:
        Delete: storage/bdb/dist/vx_3.1/component.cdf
      BitKeeper/deleted/.del-component.wpj:
        Delete: storage/bdb/dist/vx_3.1/component.wpj
      BitKeeper/deleted/.del-rec_ctemp:
        Delete: storage/bdb/dist/template/rec_ctemp
      BitKeeper/deleted/.del-rec_rep:
        Delete: storage/bdb/dist/template/rec_rep
      BitKeeper/deleted/.del-wpj.1:
        Delete: storage/bdb/dist/vx_3.1/wpj.1
      BitKeeper/deleted/.del-wpj.2:
        Delete: storage/bdb/dist/vx_3.1/wpj.2
      BitKeeper/deleted/.del-wpj.in:
        Delete: storage/bdb/dist/vx_2.0/wpj.in
      BitKeeper/deleted/.del-wpj.in~cd8fd754cedb37b2:
        Delete: storage/bdb/dist/vx_2.2/wpj.in
      BitKeeper/deleted/.del-CONFIG.in:
        Delete: storage/bdb/dist/vx_setup/CONFIG.in
      BitKeeper/deleted/.del-LICENSE.TXT:
        Delete: storage/bdb/dist/vx_setup/LICENSE.TXT
      BitKeeper/deleted/.del-MESSAGES.TCL:
        Delete: storage/bdb/dist/vx_setup/MESSAGES.TCL
      BitKeeper/deleted/.del-README.in:
        Delete: storage/bdb/dist/vx_setup/README.in
      BitKeeper/deleted/.del-SETUP.BMP:
        Delete: storage/bdb/dist/vx_setup/SETUP.BMP
      BitKeeper/deleted/.del-dbcorewix.in:
        Delete: storage/bdb/dist/winmsi/dbcorewix.in
      BitKeeper/deleted/.del-dbvarsbat.in:
        Delete: storage/bdb/dist/winmsi/dbvarsbat.in
      BitKeeper/deleted/.del-dbwix.m4:
        Delete: storage/bdb/dist/winmsi/dbwix.m4
      BitKeeper/deleted/.del-environment.in:
        Delete: storage/bdb/dist/winmsi/environment.in
      BitKeeper/deleted/.del-features.in:
        Delete: storage/bdb/dist/winmsi/features.in
      BitKeeper/deleted/.del-files.in:
        Delete: storage/bdb/dist/winmsi/files.in
      BitKeeper/deleted/.del-links.in:
        Delete: storage/bdb/dist/winmsi/links.in
      BitKeeper/deleted/.del-s_winmsi.fcn:
        Delete: storage/bdb/dist/winmsi/s_winmsi.fcn
      BitKeeper/deleted/.del-vx_allfile.in:
        Delete: storage/bdb/dist/vx_setup/vx_allfile.in
      BitKeeper/deleted/.del-vx_demofile.in:
        Delete: storage/bdb/dist/vx_setup/vx_demofile.in
      BitKeeper/deleted/.del-vx_setup.in:
        Delete: storage/bdb/dist/vx_setup/vx_setup.in
      BitKeeper/deleted/.del-wpj.3:
        Delete: storage/bdb/dist/vx_3.1/wpj.3
      BitKeeper/deleted/.del-wpj.4:
        Delete: storage/bdb/dist/vx_3.1/wpj.4
      BitKeeper/deleted/.del-wpj.5:
        Delete: storage/bdb/dist/vx_3.1/wpj.5
      BitKeeper/deleted/.del-caticon.ibd:
        Delete: storage/bdb/dist/winmsi/images/caticon.ibd
      BitKeeper/deleted/.del-db_salloc.c:
        Delete: storage/bdb/env/db_salloc.c
      BitKeeper/deleted/.del-db_shash.c:
        Delete: storage/bdb/env/db_shash.c
      BitKeeper/deleted/.del-env_failchk.c:
        Delete: storage/bdb/env/env_failchk.c
      BitKeeper/deleted/.del-env_file.c:
        Delete: storage/bdb/env/env_file.c
      BitKeeper/deleted/.del-env_method.c.b:
        Delete: storage/bdb/env/env_method.c.b
      BitKeeper/deleted/.del-env_method.c:
        Delete: storage/bdb/env/env_method.c
      BitKeeper/deleted/.del-env_open.c:
        Delete: storage/bdb/env/env_open.c
      BitKeeper/deleted/.del-env_recover.c:
        Delete: storage/bdb/env/env_recover.c
      BitKeeper/deleted/.del-env_region.c:
        Delete: storage/bdb/env/env_region.c
      BitKeeper/deleted/.del-env_register.c:
        Delete: storage/bdb/env/env_register.c
      BitKeeper/deleted/.del-env_stat.c:
        Delete: storage/bdb/env/env_stat.c
      BitKeeper/deleted/.del-fileops.src:
        Delete: storage/bdb/fileops/fileops.src
      BitKeeper/deleted/.del-foldernew.ibd:
        Delete: storage/bdb/dist/winmsi/images/foldernew.ibd
      BitKeeper/deleted/.del-folderup.ibd:
        Delete: storage/bdb/dist/winmsi/images/folderup.ibd
      BitKeeper/deleted/.del-sleepycat.jpg:
        Delete: storage/bdb/dist/winmsi/images/sleepycat.jpg
      BitKeeper/deleted/.del-topstripe.ibd:
        Delete: storage/bdb/dist/winmsi/images/topstripe.ibd
      BitKeeper/deleted/.del-webicon.ico:
        Delete: storage/bdb/dist/winmsi/images/webicon.ico
      BitKeeper/deleted/.del-winbuild.bat:
        Delete: storage/bdb/dist/winmsi/winbuild.bat
      BitKeeper/deleted/.del-fop_basic.c:
        Delete: storage/bdb/fileops/fop_basic.c
      BitKeeper/deleted/.del-fop_rec.c:
        Delete: storage/bdb/fileops/fop_rec.c
      BitKeeper/deleted/.del-fop_util.c:
        Delete: storage/bdb/fileops/fop_util.c
      BitKeeper/deleted/.del-hash.c:
        Delete: storage/bdb/hash/hash.c
      BitKeeper/deleted/.del-hash.src:
        Delete: storage/bdb/hash/hash.src
      BitKeeper/deleted/.del-hash_conv.c:
        Delete: storage/bdb/hash/hash_conv.c
      BitKeeper/deleted/.del-hash_dup.c:
        Delete: storage/bdb/hash/hash_dup.c
      BitKeeper/deleted/.del-hash_func.c:
        Delete: storage/bdb/hash/hash_func.c
      BitKeeper/deleted/.del-hash_meta.c:
        Delete: storage/bdb/hash/hash_meta.c
      BitKeeper/deleted/.del-hash_method.c:
        Delete: storage/bdb/hash/hash_method.c
      BitKeeper/deleted/.del-hash_open.c:
        Delete: storage/bdb/hash/hash_open.c
      BitKeeper/deleted/.del-hash_page.c:
        Delete: storage/bdb/hash/hash_page.c
      BitKeeper/deleted/.del-hash_rec.c:
        Delete: storage/bdb/hash/hash_rec.c
      BitKeeper/deleted/.del-hash_reclaim.c:
        Delete: storage/bdb/hash/hash_reclaim.c
      BitKeeper/deleted/.del-hash_stat.c:
        Delete: storage/bdb/hash/hash_stat.c
      BitKeeper/deleted/.del-hash_stub.c:
        Delete: storage/bdb/hash/hash_stub.c
      BitKeeper/deleted/.del-hash_upgrade.c:
        Delete: storage/bdb/hash/hash_upgrade.c
      BitKeeper/deleted/.del-hash_verify.c:
        Delete: storage/bdb/hash/hash_verify.c
      BitKeeper/deleted/.del-Design:
        Delete: storage/bdb/lock/Design
      BitKeeper/deleted/.del-hmac.c:
        Delete: storage/bdb/hmac/hmac.c
      BitKeeper/deleted/.del-hsearch.c:
        Delete: storage/bdb/hsearch/hsearch.c
      BitKeeper/deleted/.del-lock.c:
        Delete: storage/bdb/lock/lock.c
      BitKeeper/deleted/.del-lock_deadlock.c:
        Delete: storage/bdb/lock/lock_deadlock.c
      BitKeeper/deleted/.del-lock_failchk.c:
        Delete: storage/bdb/lock/lock_failchk.c
      BitKeeper/deleted/.del-lock_id.c:
        Delete: storage/bdb/lock/lock_id.c
      BitKeeper/deleted/.del-lock_list.c:
        Delete: storage/bdb/lock/lock_list.c
      BitKeeper/deleted/.del-lock_method.c:
        Delete: storage/bdb/lock/lock_method.c
      BitKeeper/deleted/.del-lock_region.c:
        Delete: storage/bdb/lock/lock_region.c
      BitKeeper/deleted/.del-lock_stat.c:
        Delete: storage/bdb/lock/lock_stat.c
      BitKeeper/deleted/.del-lock_timer.c:
        Delete: storage/bdb/lock/lock_timer.c
      BitKeeper/deleted/.del-lock_util.c:
        Delete: storage/bdb/lock/lock_util.c
      BitKeeper/deleted/.del-log.c:
        Delete: storage/bdb/log/log.c
      BitKeeper/deleted/.del-log_archive.c:
        Delete: storage/bdb/log/log_archive.c
      BitKeeper/deleted/.del-log_compare.c:
        Delete: storage/bdb/log/log_compare.c
      BitKeeper/deleted/.del-log_debug.c:
        Delete: storage/bdb/log/log_debug.c
      BitKeeper/deleted/.del-log_get.c:
        Delete: storage/bdb/log/log_get.c
      BitKeeper/deleted/.del-sha1.c:
        Delete: storage/bdb/hmac/sha1.c
      BitKeeper/deleted/.del-README~cce8f408842aa70c:
        Delete: storage/bdb/mutex/README
      BitKeeper/deleted/.del-log_method.c:
        Delete: storage/bdb/log/log_method.c
      BitKeeper/deleted/.del-log_put.c:
        Delete: storage/bdb/log/log_put.c
      BitKeeper/deleted/.del-log_stat.c:
        Delete: storage/bdb/log/log_stat.c
      BitKeeper/deleted/.del-mp_alloc.c:
        Delete: storage/bdb/mp/mp_alloc.c
      BitKeeper/deleted/.del-mp_bh.c:
        Delete: storage/bdb/mp/mp_bh.c
      BitKeeper/deleted/.del-mp_fget.c:
        Delete: storage/bdb/mp/mp_fget.c
      BitKeeper/deleted/.del-mp_fmethod.c:
        Delete: storage/bdb/mp/mp_fmethod.c
      BitKeeper/deleted/.del-mp_fopen.c:
        Delete: storage/bdb/mp/mp_fopen.c
      BitKeeper/deleted/.del-mp_fput.c:
        Delete: storage/bdb/mp/mp_fput.c
      BitKeeper/deleted/.del-mp_fset.c:
        Delete: storage/bdb/mp/mp_fset.c
      BitKeeper/deleted/.del-mp_method.c:
        Delete: storage/bdb/mp/mp_method.c
      BitKeeper/deleted/.del-mp_region.c:
        Delete: storage/bdb/mp/mp_region.c
      BitKeeper/deleted/.del-mp_register.c:
        Delete: storage/bdb/mp/mp_register.c
      BitKeeper/deleted/.del-mp_stat.c:
        Delete: storage/bdb/mp/mp_stat.c
      BitKeeper/deleted/.del-mp_sync.c:
        Delete: storage/bdb/mp/mp_sync.c
      BitKeeper/deleted/.del-mp_trickle.c:
        Delete: storage/bdb/mp/mp_trickle.c
      BitKeeper/deleted/.del-mut_alloc.c:
        Delete: storage/bdb/mutex/mut_alloc.c
      BitKeeper/deleted/.del-mut_fcntl.c:
        Delete: storage/bdb/mutex/mut_fcntl.c
      BitKeeper/deleted/.del-mut_method.c:
        Delete: storage/bdb/mutex/mut_method.c
      BitKeeper/deleted/.del-mut_pthread.c:
        Delete: storage/bdb/mutex/mut_pthread.c
      BitKeeper/deleted/.del-mut_region.c:
        Delete: storage/bdb/mutex/mut_region.c
      BitKeeper/deleted/.del-mut_stat.c:
        Delete: storage/bdb/mutex/mut_stat.c
      BitKeeper/deleted/.del-mut_tas.c:
        Delete: storage/bdb/mutex/mut_tas.c
      BitKeeper/deleted/.del-mut_win32.c:
        Delete: storage/bdb/mutex/mut_win32.c
      BitKeeper/deleted/.del-os_abs.c:
        Delete: storage/bdb/os/os_abs.c
      BitKeeper/deleted/.del-os_alloc.c:
        Delete: storage/bdb/os/os_alloc.c
      BitKeeper/deleted/.del-os_clock.c:
        Delete: storage/bdb/os/os_clock.c
      BitKeeper/deleted/.del-os_config.c:
        Delete: storage/bdb/os/os_config.c
      BitKeeper/deleted/.del-os_dir.c:
        Delete: storage/bdb/os/os_dir.c
      BitKeeper/deleted/.del-os_errno.c:
        Delete: storage/bdb/os/os_errno.c
      BitKeeper/deleted/.del-os_fid.c:
        Delete: storage/bdb/os/os_fid.c
      BitKeeper/deleted/.del-os_flock.c:
        Delete: storage/bdb/os/os_flock.c
      BitKeeper/deleted/.del-tm.c:
        Delete: storage/bdb/mutex/tm.c
      BitKeeper/deleted/.del-uts4_cc.s:
        Delete: storage/bdb/mutex/uts4_cc.s
      BitKeeper/deleted/.del-os_fsync.c:
        Delete: storage/bdb/os/os_fsync.c
      BitKeeper/deleted/.del-os_handle.c:
        Delete: storage/bdb/os/os_handle.c
      BitKeeper/deleted/.del-os_id.c:
        Delete: storage/bdb/os/os_id.c
      BitKeeper/deleted/.del-os_map.c:
        Delete: storage/bdb/os/os_map.c
      BitKeeper/deleted/.del-os_method.c:
        Delete: storage/bdb/os/os_method.c
      BitKeeper/deleted/.del-os_mkdir.c:
        Delete: storage/bdb/os/os_mkdir.c
      BitKeeper/deleted/.del-os_oflags.c:
        Delete: storage/bdb/os/os_oflags.c
      BitKeeper/deleted/.del-os_open.c:
        Delete: storage/bdb/os/os_open.c
      BitKeeper/deleted/.del-os_region.c:
        Delete: storage/bdb/os/os_region.c
      BitKeeper/deleted/.del-os_rename.c:
        Delete: storage/bdb/os/os_rename.c
      BitKeeper/deleted/.del-os_root.c:
        Delete: storage/bdb/os/os_root.c
      BitKeeper/deleted/.del-os_rpath.c:
        Delete: storage/bdb/os/os_rpath.c
      BitKeeper/deleted/.del-os_rw.c:
        Delete: storage/bdb/os/os_rw.c
      BitKeeper/deleted/.del-os_seek.c:
        Delete: storage/bdb/os/os_seek.c
      BitKeeper/deleted/.del-os_sleep.c:
        Delete: storage/bdb/os/os_sleep.c
      BitKeeper/deleted/.del-os_spin.c:
        Delete: storage/bdb/os/os_spin.c
      BitKeeper/deleted/.del-os_stat.c:
        Delete: storage/bdb/os/os_stat.c
      BitKeeper/deleted/.del-os_tmpdir.c:
        Delete: storage/bdb/os/os_tmpdir.c
      BitKeeper/deleted/.del-os_truncate.c:
        Delete: storage/bdb/os/os_truncate.c
      BitKeeper/deleted/.del-os_abs.c~ad5b599d8bf6549f:
        Delete: storage/bdb/os_win32/os_abs.c
      BitKeeper/deleted/.del-os_clock.c~2add52eff231a274:
        Delete: storage/bdb/os_win32/os_clock.c
      BitKeeper/deleted/.del-os_config.c~53e193a5e5e97cfd:
        Delete: storage/bdb/os_win32/os_config.c
      BitKeeper/deleted/.del-os_dir.c~99fbc266717a871a:
        Delete: storage/bdb/os_win32/os_dir.c
      BitKeeper/deleted/.del-os_errno.c~44204df07323cffb:
        Delete: storage/bdb/os_win32/os_errno.c
      BitKeeper/deleted/.del-os_fid.c~8f922f06a0fa5a0:
        Delete: storage/bdb/os_win32/os_fid.c
      BitKeeper/deleted/.del-os_flock.c~cc35099adbda7408:
        Delete: storage/bdb/os_win32/os_flock.c
      BitKeeper/deleted/.del-os_fsync.c~eebb7e558dacef1c:
        Delete: storage/bdb/os_win32/os_fsync.c
      BitKeeper/deleted/.del-os_handle.c~281e6b79ac5147f1:
        Delete: storage/bdb/os_win32/os_handle.c
      BitKeeper/deleted/.del-os_map.c~e8726a67b9abaa30:
        Delete: storage/bdb/os_win32/os_map.c
      BitKeeper/deleted/.del-os_open.c~996e9987793f8dbc:
        Delete: storage/bdb/os_win32/os_open.c
      BitKeeper/deleted/.del-os_rename.c~1c318d0b60c977bd:
        Delete: storage/bdb/os_win32/os_rename.c
      BitKeeper/deleted/.del-os_rw.c~7ec61bd993fe999f:
        Delete: storage/bdb/os_win32/os_rw.c
      BitKeeper/deleted/.del-os_seek.c~2b5bef3cccfa60c:
        Delete: storage/bdb/os_win32/os_seek.c
      BitKeeper/deleted/.del-os_sleep.c~d0512f5626e7c40b:
        Delete: storage/bdb/os_win32/os_sleep.c
      BitKeeper/deleted/.del-os_spin.c~e2abf23edb5bac39:
        Delete: storage/bdb/os_win32/os_spin.c
      BitKeeper/deleted/.del-os_stat.c~b7aea1c8fe0bc4c4:
        Delete: storage/bdb/os_win32/os_stat.c
      BitKeeper/deleted/.del-os_truncate.c~9761b239f54b2d96:
        Delete: storage/bdb/os_win32/os_truncate.c
      BitKeeper/deleted/.del-os_unlink.c:
        Delete: storage/bdb/os/os_unlink.c
      BitKeeper/deleted/.del-os_type.c:
        Delete: storage/bdb/os_win32/os_type.c
      BitKeeper/deleted/.del-os_unlink.c~6dee667279d01609:
        Delete: storage/bdb/os_win32/os_unlink.c
      BitKeeper/deleted/.del-qam.c:
        Delete: storage/bdb/qam/qam.c
      BitKeeper/deleted/.del-qam.src:
        Delete: storage/bdb/qam/qam.src
      BitKeeper/deleted/.del-qam_conv.c:
        Delete: storage/bdb/qam/qam_conv.c
      BitKeeper/deleted/.del-qam_files.c:
        Delete: storage/bdb/qam/qam_files.c
      BitKeeper/deleted/.del-qam_method.c:
        Delete: storage/bdb/qam/qam_method.c
      BitKeeper/deleted/.del-qam_open.c:
        Delete: storage/bdb/qam/qam_open.c
      BitKeeper/deleted/.del-qam_rec.c:
        Delete: storage/bdb/qam/qam_rec.c
      BitKeeper/deleted/.del-qam_stat.c:
        Delete: storage/bdb/qam/qam_stat.c
      BitKeeper/deleted/.del-qam_stub.c:
        Delete: storage/bdb/qam/qam_stub.c
      BitKeeper/deleted/.del-qam_upgrade.c:
        Delete: storage/bdb/qam/qam_upgrade.c
      BitKeeper/deleted/.del-qam_verify.c:
        Delete: storage/bdb/qam/qam_verify.c
      BitKeeper/deleted/.del-rep.src:
        Delete: storage/bdb/rep/rep.src
      BitKeeper/deleted/.del-rep_backup.c:
        Delete: storage/bdb/rep/rep_backup.c
      BitKeeper/deleted/.del-rep_elect.c:
        Delete: storage/bdb/rep/rep_elect.c
      BitKeeper/deleted/.del-rep_log.c:
        Delete: storage/bdb/rep/rep_log.c
      BitKeeper/deleted/.del-rep_method.c:
        Delete: storage/bdb/rep/rep_method.c
      BitKeeper/deleted/.del-rep_record.c:
        Delete: storage/bdb/rep/rep_record.c
      BitKeeper/deleted/.del-rep_region.c:
        Delete: storage/bdb/rep/rep_region.c
      BitKeeper/deleted/.del-rep_stat.c:
        Delete: storage/bdb/rep/rep_stat.c
      BitKeeper/deleted/.del-rep_stub.c:
        Delete: storage/bdb/rep/rep_stub.c
      BitKeeper/deleted/.del-rep_util.c:
        Delete: storage/bdb/rep/rep_util.c
      BitKeeper/deleted/.del-rep_verify.c:
        Delete: storage/bdb/rep/rep_verify.c
      BitKeeper/deleted/.del-seq_stat.c:
        Delete: storage/bdb/sequence/seq_stat.c
      BitKeeper/deleted/.del-sequence.c:
        Delete: storage/bdb/sequence/sequence.c
      BitKeeper/deleted/.del-txn.c:
        Delete: storage/bdb/txn/txn.c
      BitKeeper/deleted/.del-txn.src:
        Delete: storage/bdb/txn/txn.src
      BitKeeper/deleted/.del-txn_chkpt.c:
        Delete: storage/bdb/txn/txn_chkpt.c
      BitKeeper/deleted/.del-txn_failchk.c:
        Delete: storage/bdb/txn/txn_failchk.c
      BitKeeper/deleted/.del-txn_method.c:
        Delete: storage/bdb/txn/txn_method.c
      BitKeeper/deleted/.del-txn_rec.c:
        Delete: storage/bdb/txn/txn_rec.c
      BitKeeper/deleted/.del-txn_recover.c:
        Delete: storage/bdb/txn/txn_recover.c
      BitKeeper/deleted/.del-txn_region.c:
        Delete: storage/bdb/txn/txn_region.c
      BitKeeper/deleted/.del-txn_stat.c:
        Delete: storage/bdb/txn/txn_stat.c
      BitKeeper/deleted/.del-txn_util.c:
        Delete: storage/bdb/txn/txn_util.c
      BitKeeper/deleted/.del-xa.c:
        Delete: storage/bdb/xa/xa.c
      BitKeeper/deleted/.del-xa_db.c:
        Delete: storage/bdb/xa/xa_db.c
      BitKeeper/deleted/.del-xa_map.c:
        Delete: storage/bdb/xa/xa_map.c
      sql/field.cc:
        Antony's patch
      sql/field.h:
        Antony's patch
      2a565179
  2. 15 Aug, 2006 14 commits
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/dep-5.1 · 3be8b9a3
      unknown authored
      into  zim.(none):/home/brian/mysql/remove-bdb-5.1
      
      
      3be8b9a3
    • unknown's avatar
      Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1 · 336d1923
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      336d1923
    • unknown's avatar
      Remove building, packing, and installing the "max" server from the RPM "spec" file. · 3027249e
      unknown authored
      
      support-files/mysql.spec.sh:
        Remove building, packing, and installing the "max" server.
      3027249e
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 65ff243b
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      mysql-test/r/cast.result:
        Auto merged
      sql/item_func.cc:
        Auto merged
      65ff243b
    • unknown's avatar
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 02c63a3e
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      mysql-test/t/ndb_lock.test:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Merge (using local)
      sql/ha_ndbcluster.cc:
        Merge
      sql/ha_ndbcluster.h:
        Merge
      02c63a3e
    • unknown's avatar
      Fix for bug #21059 Server crashes on join query with large dataset with NDB... · 6464d62c
      unknown authored
      Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: do not release operation records for on-going read_multi_range
      
      
      
      6464d62c
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · 115eb7df
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      ndb/include/ndbapi/NdbTransaction.hpp:
        Merge
      sql/ha_ndbcluster.cc:
        Merge
      sql/ha_ndbcluster.h:
        Merge
      115eb7df
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · 87b7363c
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      87b7363c
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 · 46691ca1
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
      
      
      mysql-test/t/ndb_lock.test:
        Auto merged
      sql/ha_ndbcluster.cc:
        Auto merged
      sql/ha_ndbcluster.h:
        Auto merged
      storage/ndb/include/ndbapi/NdbTransaction.hpp:
        Auto merged
      mysql-test/r/ndb_lock.result:
        Merge (using local)
      46691ca1
    • unknown's avatar
      Period removal for warning message. · 14bd339e
      unknown authored
      
      mysql-test/r/backup.result:
        With or without a period?
      14bd339e
    • unknown's avatar
      Merge mysql.com:/windows/Linux_space/MySQL/mysql-4.1 · ee1b06d5
      unknown authored
      into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0
      
      
      mysql-test/r/ndb_lock.result:
        Auto merged
      mysql-test/t/ndb_lock.test:
        Auto merged
      ndb/include/ndbapi/NdbTransaction.hpp:
        Merge (using local)
      sql/ha_ndbcluster.cc:
        Merge (using local)
      sql/ha_ndbcluster.h:
        Merge (using local)
      ee1b06d5
    • unknown's avatar
      ndb_lock.test, ndb_lock.result: · cd49f996
      unknown authored
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      ha_ndbcluster.h, ha_ndbcluster.cc, NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      
      
      ndb/include/ndbapi/NdbConnection.hpp:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.h:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      sql/ha_ndbcluster.cc:
        Fix for bug #21059  Server crashes on join query with large dataset with NDB tables: Releasing operation for each intermediate batch, before next call to trans->execute(NoCommit);
      mysql-test/r/ndb_lock.result:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      mysql-test/t/ndb_lock.test:
        bug #18184  SELECT ... FOR UPDATE does not work..: New test case
      cd49f996
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/dep-5.1 · 882b7707
      unknown authored
      into  zim.(none):/home/brian/mysql/remove-bdb-5.1
      
      
      configure.in:
        Auto merged
      mysql-test/mysql-test-run.pl:
        Auto merged
      mysql-test/r/backup.result:
        Auto merged
      mysql-test/r/im_utils.result:
        Auto merged
      mysql-test/r/show_check.result:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysql_priv.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      mysql-test/t/federated_transactions.test:
        Merge
      882b7707
  3. 14 Aug, 2006 20 commits
    • unknown's avatar
      Merge fixes · 7260fd70
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Merge result fix
      mysql-test/r/repair.result:
        Merge Result Fix
      mysql-test/t/mysqldump.test:
        Fix of test
      7260fd70
    • unknown's avatar
      Merge zim.(none):/home/brian/mysql/dep-5.0 · 948a8943
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.1
      
      
      client/mysql.cc:
        Auto merged
      mysql-test/r/grant.result:
        Auto merged
      mysql-test/r/grant2.result:
        Auto merged
      mysql-test/r/heap_btree.result:
        Auto merged
      mysql-test/t/grant.test:
        Auto merged
      mysql-test/t/grant2.test:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      scripts/fill_func_tables.sh:
        Auto merged
      scripts/mysql_install_db.sh:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/field.h:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/set_var.cc:
        Auto merged
      sql/sql_update.cc:
        Auto merged
      storage/heap/hp_delete.c:
        Auto merged
      storage/myisam/mi_update.c:
        Auto merged
      storage/myisam/sort.c:
        Auto merged
      mysql-test/r/mysqldump.result:
        Fixing Result
      mysql-test/r/repair.result:
        Fixing result
      mysql-test/t/mysqldump.test:
        Merging change
      storage/archive/ha_archive.cc:
        Merging in change
      948a8943
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maint · c235176e
      unknown authored
      into  zim.(none):/home/brian/mysql/remove-bdb-5.1
      
      
      c235176e
    • unknown's avatar
      Removed warnings for Windows build issues. Edited Windows README to remove reference to BDB. · cd066443
      unknown authored
      
      libmysqld/CMakeLists.txt:
        Fix for build for BDB
      mysys/base64.c:
        Removed warning
      mysys/my_pread.c:
        Removed warning
      sql-common/my_time.c:
        Removed Warning
      sql/CMakeLists.txt:
        Editing for BDB
      storage/csv/ha_tina.cc:
        Removed warning
      storage/myisam/ft_parser.c:
        Removed warning
      storage/myisam/mi_delete_all.c:
        Removed unused variable
      storage/myisam/mi_packrec.c:
        Removed unused variable
      win/README:
        Fixed docs on Windows BDB
      win/configure.js:
        Removed function call to add support for building BDB
      cd066443
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 45a5ca85
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      45a5ca85
    • unknown's avatar
      scripts/make_binary_distribution.sh : Drop the "max" server from 5.1 packages. · c657ab8f
      unknown authored
      
      scripts/make_binary_distribution.sh:
        Drop the "max" server from 5.1 packages.
      c657ab8f
    • unknown's avatar
      Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0 · 61d5563b
      unknown authored
      into  zim.(none):/home/brian/mysql/dep-5.0
      
      
      61d5563b
    • unknown's avatar
      Fix a test case (proper clean up). · 492e7b08
      unknown authored
      
      mysql-test/r/mysqldump.result:
        Update results.
      mysql-test/t/mysqldump.test:
        Fix a bug in the test case that left user mysqltest_1@localhost 
        around (this broke furhter tests).
      492e7b08
    • unknown's avatar
      Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 · 5d88ac5c
      unknown authored
      into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt
      
      
      5d88ac5c
    • unknown's avatar
      Fix a test suite failure. · e7f7263d
      unknown authored
      
      mysql-test/r/partition_grant.result:
        Update results (cleanup pon top of partition_grant.test)
      e7f7263d
    • unknown's avatar
      Merge may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-4.1 · 867f7368
      unknown authored
      into  may.pils.ru:/home/svoj/devel/mysql/BUG18874/mysql-5.0
      
      
      myisam/sort.c:
        Auto merged
      mysql-test/r/repair.result:
        Auto merged
      mysql-test/t/repair.test:
        Auto merged
      867f7368
    • unknown's avatar
      Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 021cea21
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      sql/mysql_priv.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_delete.cc:
        Auto merged
      sql/sql_trigger.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/sql_yacc.yy:
        Auto merged
      sql/table.cc:
        Auto merged
      sql/sql_db.cc:
        Manual merge.
      sql/sql_show.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      021cea21
    • unknown's avatar
      675a5b77
    • unknown's avatar
      BUG#18874 - Setting myisam_repair_threads > 1, index cardinality always 1 · f6d7985a
      unknown authored
      Fixed by moving update_key_parts() down to be after write_index().
      
      
      myisam/sort.c:
        write_index() collects index statistic which is further used in
        update_key_parts(). Thus update_key_parts() must be called after
        write_index().
      mysql-test/r/repair.result:
        Test case for bug#18874.
      mysql-test/t/repair.test:
        Test case for bug#18874.
      f6d7985a
    • unknown's avatar
      Merge romeo.(none):/home/bkroot/mysql-5.1-new-maint · 4268f232
      unknown authored
      into  romeo.(none):/home/bk/mytap-mysql-5.1-new-maint
      
      
      4268f232
    • unknown's avatar
      Fixing unit test execution script to work with AIX 5.2 and OS X machines. · dc2264ab
      unknown authored
      These are using old version of the Test::Harness modules, so I resort
      to a safer way of running executable files.
      
      
      unittest/README.txt:
        Adding reference to Doxygen-generated documentation on the intranet.
      unittest/unit.pl:
        Using environment HARNESS_PERL_SWITCHES instead of a replacement
        straps
      dc2264ab
    • unknown's avatar
      Fix for bug#20648 We introduce a new field method for knowing "real size", and... · ba8be739
      unknown authored
      Fix for bug#20648 We introduce a new field method for knowing "real size", and we now in archive null unused bits of a row to null before writing. 
      
      
      sql/field.cc:
        data_length for field needs to be calculated directly.
      sql/field.h:
        The new method data_length() returns the "real" length of the field.
      sql/ha_archive.cc:
        Before a write_row() archive nulls space beyond the size of the row in varchars to make sure that compression only sees NULL.
      ba8be739
    • unknown's avatar
      Updated row result, and fix for Windows build. · 03830dd6
      unknown authored
      
      CMakeLists.txt:
        Fix for Windows build
      mysql-test/r/binlog_row_binlog.result:
        Updated row result
      mysql-test/r/multi_update.result:
        Updated row result
      mysql-test/t/multi_update.test:
        Updated row result
      03830dd6
    • unknown's avatar
      Manual merge 5.0->5.1. Post-merge fixes. · 21e75cb0
      unknown authored
      
      client/mysqldump.c:
        A post-merge fix - 'sock' was renamed to 'mysql'
      mysql-test/r/events_bugs.result:
        A post merge fix: now we strip rear comments from the query before
        it gets into the log.
      mysql-test/r/func_group.result:
        A post merge fix: default clause is now printed uppercase.
      mysql-test/r/im_life_cycle.result:
        Fix my mistake in manual resolve.
      mysql-test/r/mysqlcheck.result:
        use test; - after we drop client_test_db there is no current database.
        This cleanup is present in 5.1 only, but the test that was added in 
        5.0 assumes there is a current database, test.
      mysql-test/r/mysqldump.result:
        Ignore results of execution of mysqldump: we can't rely on 
        MASTER_LOG_POS in test results, it's different for statement
        and row level logging.
      mysql-test/r/mysqlshow.result:
        A post-merge fix: information schema contains a few more tables
        in 5.1
      mysql-test/r/mysqltest.result:
        A post merge fix: add 5.1 test end separator.
      mysql-test/r/ndb_basic.result:
        A post-merge fix: add test end separators.
      mysql-test/r/rpl_switch_stm_row_mixed.result:
        A post merge fix: length of varbinary column is now 3 times less.
        Assuming a side effect of some other change. Length of any
        field is not relevant in this test.
      mysql-test/r/rpl_view.result:
        Add an end of test marker.
      mysql-test/r/show_check.result:
        Remove duplicate results. Add results from a merged test case.
      mysql-test/r/sp-error.result:
        Add test end separators.
      mysql-test/r/sp-security.result:
        Post-merge fix: use test after the current database is dropped.
      mysql-test/r/sp.result:
        Remove a duplicate result (bad merge that left a copy of
        the test case for Bug#19862 in the test suite).
      mysql-test/r/strict.result:
        An after-merge fix for a new test case: in 5.1 we issue a more accurate
        error message: "Incorrect value" instead of "Truncated value". I reason
        it so that in case of an error nothing is truncated, really.
        Also found similar changes in other test cases.
      mysql-test/r/type_datetime.result:
        Fix the text of an error.
      mysql-test/r/union.result:
        A post-merge fix: CHARACTER SET is now uppercase.
      mysql-test/t/mysqlcheck.test:
        A post-merge fix: use test, after current database is dropped, there
        is no current database.
      mysql-test/t/mysqldump.test:
        Disable result log: it's dependent on binlog position.
      mysql-test/t/sp-security.test:
        use test
      sql/item_sum.cc:
        Adjust the call to the constructor after the merge.
      sql/sp_head.cc:
        Add a missing DBUG_VOID_RETURN, move security checks out of
        execute_trigger to Table_triggers_list: in 5.1 we check for
        TRIGGER privilege, not SUPER privilege to execute triggers, so these
        checks lack table context inside execute_trigger and have to be
        performed when we have table object on hand.
      sql/sql_db.cc:
        A post-merge fix: adjust load_db_opt_by_name and check_db_dir_existence
        (new functions added in 5.0) to be tablename-to-filename encoding 
        friendly.
      sql/sql_lex.cc:
        A post-merge fix: make skip_rear_comments operate on const uchar *s.
      sql/sql_lex.h:
        A post-merge fix.
      sql/sql_show.cc:
        A post-merge fix: fix a bad merge, rename orig_sql_command -> sql_command.
      sql/sql_trigger.cc:
        A post-merge fix: move security checks to process_triggers
        from execute_trigger.
      sql/sql_view.cc:
        Adjust to the new signature of skip_rear_comments.
      sql/sql_yacc.yy:
        Adjust to the new signature of init_strings.
      21e75cb0
    • unknown's avatar
      Fixed warning message breakage. · 1363c9b2
      unknown authored
      Fixed install breakage (my own fault)
      Edited exampled cnf to remove bdb references. 
      
      
      mysql-test/r/backup.result:
        fix warnings
      mysql-test/r/im_options.result:
        Remove missed bdb skip
      mysql-test/r/im_utils.result:
        Remove missed bdb-skip
      mysql-test/r/log_tables.result:
        Fix warnings
      mysql-test/r/show_check.result:
        Fix warnings
      mysql-test/r/sp_trans.result:
        Fix warning
      mysql-test/r/type_timestamp.result:
        Fix warning
      mysql-test/r/warnings.result:
        Fix warning
      mysql-test/t/disabled.def:
        Disabled Federation test
      mysql-test/t/federated_transactions.test:
        Fixed comments in federation test
      netware/mysql_install_db.c:
        Fix install breakage.
      netware/mysql_test_run.c:
        Fix install breakage.
      scripts/mysql_install_db.sh:
        Fix install breakage
      storage/myisam/ftbench/ft-test-run.sh:
        Fixed test which is never run
      support-files/my-innodb-heavy-4G.cnf.sh:
        Modified examples
      support-files/my-small.cnf.sh:
        Modified examples
      1363c9b2
  4. 12 Aug, 2006 1 commit
    • unknown's avatar
      Merge bodhi.local:/opt/local/work/tmp_merge · f68085c4
      unknown authored
      into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
      
      
      BitKeeper/etc/ignore:
        auto-union
      BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
        Auto merged
      BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56:
        Auto merged
      BitKeeper/deleted/.del-mysys.dsp~32695fee91189326:
        Auto merged
      BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
        Auto merged
      BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
        Auto merged
      BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
        Auto merged
      client/mysql.cc:
        Auto merged
      client/mysqlbinlog.cc:
        Auto merged
      client/mysqlcheck.c:
        Auto merged
      client/mysqldump.c:
        Auto merged
      client/mysqltest.c:
        Auto merged
      dbug/dbug.c:
        Auto merged
      extra/perror.c:
        Auto merged
      extra/yassl/src/yassl_imp.cpp:
        Auto merged
      extra/yassl/src/yassl_int.cpp:
        Auto merged
      include/mysql.h:
        Auto merged
      include/mysql_com.h:
        Auto merged
      libmysql/libmysql.c:
        Auto merged
      mysql-test/r/cast.result:
        Auto merged
      mysql-test/r/date_formats.result:
        Auto merged
      mysql-test/r/federated.result:
        Auto merged
      mysql-test/r/func_compress.result:
        Auto merged
      mysql-test/r/func_group.result:
        Auto merged
      mysql-test/r/func_time.result:
        Auto merged
      mysql-test/r/gis-rtree.result:
        Auto merged
      mysql-test/r/gis.result:
        Auto merged
      mysql-test/r/im_daemon_life_cycle.result:
        Auto merged
      mysql-test/r/im_utils.result:
        Auto merged
      mysql-test/r/join_outer.result:
        Auto merged
      mysql-test/r/mysqlcheck.result:
        Auto merged
      mysql-test/r/rpl_sp.result:
        Auto merged
      mysql-test/r/rpl_trigger.result:
        Auto merged
      mysql-test/r/sp-code.result:
        Auto merged
      mysql-test/r/sp-security.result:
        Auto merged
      mysql-test/r/strict.result:
        Auto merged
      mysql-test/r/type_blob.result:
        Auto merged
      mysql-test/r/type_datetime.result:
        Auto merged
      mysql-test/r/type_ranges.result:
        Auto merged
      mysql-test/r/udf.result:
        Auto merged
      mysql-test/r/user_var.result:
        Auto merged
      mysql-test/t/cast.test:
        Auto merged
      mysql-test/t/disabled.def:
        Auto merged
      mysql-test/t/func_group.test:
        Auto merged
      mysql-test/t/func_time.test:
        Auto merged
      mysql-test/t/im_daemon_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_life_cycle.imtest:
        Auto merged
      mysql-test/t/im_utils.imtest:
        Auto merged
      mysql-test/t/mysql.test:
        Auto merged
      mysql-test/t/mysqlbinlog.test:
        Auto merged
      mysql-test/t/mysqlcheck.test:
        Auto merged
      mysql-test/t/ps.test:
        Auto merged
      mysql-test/t/rpl_trigger.test:
        Auto merged
      mysql-test/t/sp-security.test:
        Auto merged
      mysql-test/t/strict.test:
        Auto merged
      mysql-test/t/udf.test:
        Auto merged
      sql/field.cc:
        Auto merged
      sql/item.cc:
        Auto merged
      sql/item_func.cc:
        Auto merged
      sql/item_func.h:
        Auto merged
      sql/item_strfunc.cc:
        Auto merged
      sql/item_strfunc.h:
        Auto merged
      sql/item_subselect.cc:
        Auto merged
      sql/item_sum.h:
        Auto merged
      sql/item_timefunc.cc:
        Auto merged
      sql/mysqld.cc:
        Auto merged
      sql/protocol.cc:
        Auto merged
      sql/slave.cc:
        Auto merged
      sql/sp.cc:
        Auto merged
      sql/sp_head.h:
        Auto merged
      sql/sql_base.cc:
        Auto merged
      sql/sql_class.h:
        Auto merged
      sql/sql_lex.cc:
        Auto merged
      sql/sql_parse.cc:
        Auto merged
      sql/sql_prepare.cc:
        Auto merged
      sql/sql_udf.cc:
        Auto merged
      sql/sql_view.cc:
        Auto merged
      sql/table.cc:
        Auto merged
      sql-common/client.c:
        Auto merged
      sql-common/my_time.c:
        Auto merged
      sql/table.h:
        Auto merged
      storage/ndb/src/kernel/error/ndbd_exit_codes.c:
        Auto merged
      storage/ndb/src/mgmsrv/ConfigInfo.cpp:
        Auto merged
      mysql-test/r/im_life_cycle.result:
        e
        use local
      mysql-test/r/ps.result:
        use local
      client/Makefile.am:
        Manual merge.
      client/mysqlimport.c:
        Manual merge.
      configure.in:
        Manual merge.
      mysql-test/mysql-test-run.pl:
        Manual merge.
      mysql-test/r/mysqldump.result:
        Manual merge.
      mysql-test/r/mysqltest.result:
        Manual merge.
      mysql-test/r/ndb_basic.result:
        Manual merge.
      mysql-test/r/rpl_view.result:
        Manual merge.
      mysql-test/r/show_check.result:
        Manual merge.
      mysql-test/r/sp-error.result:
        Manual merge.
      mysql-test/r/sp.result:
        Manual merge.
      mysql-test/r/union.result:
        Manual merge.
      mysql-test/t/mysqldump.test:
        Manual merge.
      mysql-test/t/mysqltest.test:
        Manual merge.
      mysql-test/t/ndb_basic.test:
        Manual merge.
      mysql-test/t/rpl_sp.test:
        Manual merge.
      mysql-test/t/rpl_view.test:
        Manual merge.
      mysql-test/t/show_check.test:
        Manual merge.
      mysql-test/t/sp-error.test:
        Manual merge.
      mysql-test/t/sp.test:
        Manual merge.
      sql/item_sum.cc:
        Manual merge.
      sql/mysql_priv.h:
        Manual merge.
      sql/sp_head.cc:
        Manual merge.
      sql/sql_db.cc:
        Manual merge.
      sql/sql_delete.cc:
        Manual merge.
      sql/sql_lex.h:
        Manual merge.
      sql/sql_show.cc:
        Manual merge.
      sql/sql_table.cc:
        Manual merge.
      sql/sql_trigger.cc:
        Manual merge.
      sql/sql_yacc.yy:
        Manual merge.
      tests/mysql_client_test.c:
        Manual merge.
      f68085c4
  5. 11 Aug, 2006 3 commits