mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
300 commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
21263710af |
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl mysql-test/r/rpl_row_tabledefs_2myisam.result: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged mysql-test/t/disabled.def: SCCS merged |
||
|
unknown
|
3936ce19d2 |
WL#3259 (RBR with more columns on slave than master):
Incorporating changes from review. Fixing one bug that surfaced. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Adding tests that UPDATE and DELETE does not generate an error. mysql-test/r/rpl_row_tabledefs_2myisam.result: Result change. mysql-test/r/rpl_row_tabledefs_3innodb.result: Result change. mysql-test/t/disabled.def: Enabling rpl_sp_effects (even though it gives a result mismatch currently). sql/field.cc: Using constant to denote undefined last null byte. sql/field.h: Using constant to denote undefined last null byte. Adding documentation. sql/log_event.cc: Not generating error for non-NULL no-DEFAULT columns when updating or deleting row. Better documentation and comments. sql/rpl_utility.cc: Moving documentation to header file. sql/rpl_utility.h: Documenting class and members. |
||
|
unknown
|
45546f3de8 |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge BitKeeper/deleted/.del-rpl_heap.test: Auto merged Makefile.am: Auto merged mysql-test/extra/binlog_tests/binlog.test: Auto merged mysql-test/r/binlog_stm_binlog.result: Auto merged mysql-test/r/rpl_switch_stm_row_mixed.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/rpl_trigger.test: Auto merged sql/CMakeLists.txt: Auto merged sql/Makefile.am: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged unittest/README.txt: Auto merged unittest/unit.pl: Auto merged mysql-test/t/disabled.def: Merge (main -> rpl 5.1) |
||
|
unknown
|
7ed6333681 |
Merge romeo.(none):/home/bkroot/mysql-5.1-wl3228
into romeo.(none):/home/bk/w3259-mysql-5.1-new-rpl sql/field.h: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/Makefile.am: Merge patch for worklog 3259 into mysql-5.1-rpl sql/field.cc: Merge patch for worklog 3259 into mysql-5.1-rpl sql/log_event.cc: Merge patch for worklog 3259 into mysql-5.1-rpl |
||
|
unknown
|
2a56517972 |
Cheery picked Antony's patch to allow for Window's builds in 5.1
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 |
||
|
unknown
|
882b770734 |
Merge zim.(none):/home/brian/mysql/dep-5.1
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 |
||
|
unknown
|
948a894327 |
Merge zim.(none):/home/brian/mysql/dep-5.0
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 |
||
|
unknown
|
ba8be73946 |
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. |
||
|
unknown
|
3662bc591f |
Merge rama.(none):/home/jimw/my/mysql-5.0-21284
into rama.(none):/home/jimw/my/mysql-5.1-clean sql/field.h: Resolve conflict sql/ha_federated.cc: Resolve conflict |
||
|
unknown
|
f1af1a5d7e |
Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2 Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge BitKeeper/deleted/.del-libmysqld.dsp~78dc6a589e5a4149: Auto merged configure.in: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/merge.test: Auto merged sql/field.h: Auto merged sql/ha_myisammrg.cc: Auto merged BitKeeper/deleted/.del-libmysqld.vcproj~a75d5b9a5967dea0: Auto merged BitKeeper/deleted/.del-libmysqld_ia64.dsp~578ab58d5f281d2a: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2: Auto merged BitKeeper/deleted/.del-mysqldemb.dsp~1baf8c0e59ee9f7e: Auto merged BitKeeper/deleted/.del-mysqldemb.vcproj~54c64d55ccc51a7c: Auto merged BitKeeper/deleted/.del-mysqldemb_ia64.dsp~c7f7d75d542393cd: Auto merged BitKeeper/deleted/.del-mysqldmax.dsp~5d213fe1c204142e: Auto merged BitKeeper/deleted/.del-mysqldmax_ia64.dsp~25006b7cc0725ad1: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged include/my_base.h: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/r/federated.result: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge mysql-test/t/federated.test: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/field.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/ha_federated.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge sql/handler.cc: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge tests/mysql_client_test.c: Hand merge of conflicts (5.0-5.1 merge), second try Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006: bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge |
||
|
unknown
|
c102fe94ad |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/tmp_merge-5.0-opt-mysql client/mysql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/func_str.test: Auto merged mysql-test/t/udf.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item_strfunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/time.cc: Auto merged mysql-test/r/sp.result: Manual merge mysql-test/t/sp.test: Manual merge |
||
|
unknown
|
f75e79e0fc | After merge fix | ||
|
unknown
|
ddb91478e8 |
Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
into sunlight.local:/local_work/tmp_merge-5.1-opt-mysql client/mysql.cc: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/group_min_max.result: Auto merged BitKeeper/deleted/.del-make_win_src_distribution.sh~f80d8fca44e4e5f1: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysqld_ia64.dsp~7f8cf84d81ee04e2: Auto merged BitKeeper/deleted/.del-mysqldump.dsp~a8bd23547d3fc27e: Auto merged BitKeeper/deleted/.del-mysqldump_ia64.dsp~a2aabe898be35b31: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/view.result: Auto merged mysql-test/t/date_formats.test: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/group_min_max.test: Auto merged mysql-test/t/innodb.test: Auto merged mysql-test/t/innodb_mysql.test: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/select.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/view.test: Auto merged sql/field.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_subselect.cc: Auto merged sql/item_subselect.h: Auto merged sql/opt_range.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/time.cc: Auto merged storage/ndb/test/ndbapi/Makefile.am: Auto merged strings/decimal.c: Auto merged mysql-test/r/analyse.result: Manual merge mysql-test/r/bigint.result: Manual merge mysql-test/r/create.result: Manual merge mysql-test/r/information_schema.result: Manual merge mysql-test/r/ps_2myisam.result: Manual merge mysql-test/r/ps_3innodb.result: Manual merge mysql-test/r/ps_4heap.result: Manual merge mysql-test/r/ps_5merge.result: Manual merge mysql-test/r/ps_6bdb.result: Manual merge mysql-test/r/rpl_insert_id.result: Manual merge mysql-test/r/select.result: Manual merge mysql-test/r/sp.result: Manual merge mysql-test/r/subselect.result: Manual merge mysql-test/t/information_schema.test: Manual merge mysql-test/t/rpl_insert_id.test: Manual merge sql/field.h: Manual merge sql/item.cc: Manual merge sql/item.h: Manual merge sql/item_strfunc.h: Manual merge sql/item_sum.cc: Manual merge sql/mysql_priv.h: Manual merge sql/share/errmsg.txt: Manual merge sql/sql_class.h: Manual merge sql/sql_select.cc: Manual merge |
||
|
unknown
|
919c5596d4 |
Bug #21284: Add Field::needs_quote() method and use it in Federated
The fix for bug 17608 removed the behavior of only adding quotes to values that needed it when constructing the queries sent by the federated storage engine. This restores that behavior, but using a new virtual Field method. (The old one had a hardcoded list of field types.) No test included. The behavior can be verified by inspecting the query log on the slave in the federated test. sql/field.h: Add str_needs_quotes() method to indicate whether the results of val_str() requires quoting when used in constructing an SQL query. sql/ha_federated.cc: Restore behavior of only quoting values that need it, using the new Field::str_needs_quotes() method. |
||
|
unknown
|
5a3a1c98a4 |
field.h:
Fixed typo. sql/field.h: Fixed typo. |
||
|
unknown
|
f171d628c7 |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/autopush/12185-bug-5.0-opt-mysql mysql-test/r/create.result: Auto merged mysql-test/t/innodb.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/item.cc: Auto merged mysql-test/r/union.result: SCCS merged mysql-test/t/union.test: SCCS merged |
||
|
unknown
|
35209c68ea |
Fixed bug#12185: Data type aggregation may produce wrong result
The Item::tmp_table_field_from_field_type() function creates Field_datetime object instead of Field_timestamp object for timestamp field thus always changing data type is a tmp table is used. The Field_blob object constructor which is used in the Item::tmp_table_field_from_field_type() is always setting packlength field of newly created blob to 4. This leads to changing fields data type for example from the blob to the longblob if a temporary table is used. The Item::make_string_field() function always converts Field_string objects to Field_varstring objects. This leads to changing data type from the char/binary to varchar/varbinary. Added appropriate Field_timestamp object constructor for using in the Item::tmp_table_field_from_field_type() function. Added Field_blob object constructor which sets pack length according to max_length argument. The Item::tmp_table_field_from_field_type() function now creates Field_timestamp object for a timestamp field. The Item_type_holder::display_length() now returns correct NULL length NULL length. The Item::make_string_field() function now doesn't change Field_string to Field_varstring in the case of Item_type_holder. The Item::tmp_table_field_from_field_type() function now uses the Field_blob constructor which sets packlength according to max_length. mysql-test/t/union.test: Added test case for bug#12185: Data type aggregation may produce wrong result Corrected test case after fix for bug#12185 mysql-test/t/innodb.test: Corrected test case after fix for bug#12185 mysql-test/r/union.result: Added test case for bug#12185: Data type aggregation may produce wrong result Corrected test case after fix for bug#12185 mysql-test/r/innodb.result: Corrected test case after fix for bug#12185 mysql-test/r/create.result: Corrected the test case after fixing bug#12185 sql/field.h: Fixed bug#12185: Data type aggregation may produce wrong result Added Field_blob object constructor which sets packlength according to max_length argument. sql/item.cc: Fixed bug#12185: Data type aggregation may produce wrong result The Item::make_string_field() function now doesn't change Field_string to Field_varstring in the case of Item_type_holder. The Item::tmp_table_field_from_field_type() function now creates Field_timestamp object for a timestamp field. The Item::tmp_table_field_from_field_type() function now uses the Field_blob constructor which sets packlength according to max_length. The Item_type_holder::display_length() now returns correct NULL length NULL length. sql/field.cc: Fixed bug#12185: Data type aggregation may produce wrong result Added appropriate Field_timestamp object constructor for using in the Item::tmp_table_field_from_field_type() function. |
||
|
unknown
|
abbf7ad014 |
Bug #17608: String literals lost during INSERT query on FEDERATED table
The Federated storage engine used Field methods that had arbitrary limits on the amount of data they could process, which caused problems with data over that limit (4K). By removing those Field methods and just using features of the String class, we can avoid this problem. mysql-test/r/federated.result: Add new results mysql-test/t/federated.test: Add new regression test sql/field.cc: Remove unnecessary methods sql/field.h: Remove unnecessary methods sql/ha_federated.cc: Remove use of quote_data, use String::print() to get escaping of strings, and don't bother with needs_quotes, just always quote values. |
||
|
unknown
|
d6e3a9ddcb |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/ps.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/ndb_autodiscover3.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/wait_timeout.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged |
||
|
unknown
|
013cbc3964 |
Merge chilla.local:/home/mydev/mysql-5.0
into chilla.local:/home/mydev/mysql-5.0-bug16218 sql/field.cc: Auto merged sql/field.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/table.cc: Auto merged |
||
|
unknown
|
a085d0988e |
Merge chilla.local:/home/mydev/mysql-5.0-bug16218
into chilla.local:/home/mydev/mysql-5.1-ateam sql/field.h: Auto merged sql/sql_select.cc: Auto merged sql/sql_trigger.cc: Auto merged sql/field.cc: Manual merge sql/sql_insert.cc: Manual merge sql/table.cc: Manual merge |
||
|
unknown
|
30de4903ae |
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new-maint BUILD/compile-dist: Auto merged BitKeeper/deleted/.del-partition_innodb.result: Auto merged BitKeeper/deleted/.del-partition_innodb.test: Auto merged client/mysqltest.c: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/create_not_windows.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/partition.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/t/innodb_mysql.test: Auto merged mysql-test/t/partition.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/wait_timeout.test: Auto merged mysys/my_lib.c: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/unireg.cc: Auto merged mysql-test/extra/rpl_tests/rpl_log.test: manuakl merge mysql-test/lib/mtr_process.pl: manuakl merge mysql-test/mysql-test-run.pl: manuakl merge mysql-test/r/type_newdecimal.result: manuakl merge mysql-test/t/create.test: manuakl merge mysql-test/t/func_group.test: manuakl merge mysql-test/t/type_newdecimal.test: manuakl merge |
||
|
unknown
|
f92fd7c98a |
Fix for bug #18014: data loss caused by altering decimal fields.
mysql-test/r/type_newdecimal.result: Fix for bug #18014: data loss caused by altering decimal fields. - test result mysql-test/t/type_newdecimal.test: Fix for bug #18014: data loss caused by altering decimal fields. - test case sql/field.cc: Fix for bug #18014: data loss caused by altering decimal fields. - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions. sql/field.h: Fix for bug #18014: data loss caused by altering decimal fields. - Field_new_decimal::is_equal() introduced for proper comparisons of the decimal field definitions. |
||
|
unknown
|
ab5ebc0fb7 |
Bug#16218 - Crash on insert delayed
Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. INSERT DELAYED crashed in 5.0 on a table with a varchar that could be NULL and was created pre-5.0 (Bugs 16218 and 13707). INSERT DELAYED corrupted data in 5.0 on a table with varchar fields that was created pre-5.0 (Bugs 17294 and 16611). In case of INSERT DELAYED the open table is copied from the delayed insert thread to be able to create a record for the queue. When copying the fields, a method was used that did convert old varchar to new varchar fields and did not set up some pointers into the record buffer of the table. The field conversion was guilty for the misinterpretation of the record contents by the delayed insert thread. The wrong pointer setup was guilty for the crashes. For Bug 13707 (Server crash with INSERT DELAYED on MyISAM table) I fixed the above mentioned method to set up one of the pointers. For Bug 16218 I set up the other pointers too. But when looking at the corruptions I got aware that converting the field type was totally wrong for INSERT DELAYED. The copied table is used to create a record that is to be sent to the delayed insert thread. Of course it can interpret the record correctly only if all field types are the same in both table objects. So I revoked the fix for Bug 13707 and changed the new_field() method so that it can suppress conversions. No test case as this is a migration problem. One needs to create a table with 4.x and use it with 5.x. I added two test scripts to the bug report. sql/field.cc: Bug#16218 - Crash on insert delayed Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added parameter 'keep_type' to Field::new_field(). Undid the change from Bug 13707 (Server crash with INSERT DELAYED on MyISAM table). I solved all four bugs in sql/sql_insert.cc by making exact duplicates of the fields. The new_field() method converts certain field types, which is wrong for INSERT DELAYED. sql/field.h: Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added parameter 'keep_type' to Field::new_field(). sql/sql_insert.cc: Bug#16218 - Crash on insert delayed Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added comments. Made small style fixes. Used the new parameter 'keep_type' of Field::new_field() to avoid field type conversion. The table copy must have exactly the same types of fields as the original table. Otherwise the record contents created by the foreground thread could be misinterpreted by the delayed insert thread. sql/sql_select.cc: Bug#16218 - Crash on insert delayed Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added parameter 'keep_type' to Field::new_field(). Undid the change from Bug 13707 (Server crash with INSERT DELAYED on MyISAM table). I solved all four bugs in sql/sql_insert.cc by making exact duplicates of the fields. The new_field() method converts certain field types, which is wrong for INSERT DELAYED. sql/sql_trigger.cc: Bug#16218 - Crash on insert delayed Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added parameter 'keep_type' to Field::new_field(). Undid the change from Bug 13707 (Server crash with INSERT DELAYED on MyISAM table). I solved all four bugs in sql/sql_insert.cc by making exact duplicates of the fields. The new_field() method converts certain field types, which is wrong for INSERT DELAYED. sql/table.cc: Bug#16218 - Crash on insert delayed Bug#17294 - INSERT DELAYED puting an \n before data Bug#16611 - INSERT DELAYED corrupts data Bug#13707 - Server crash with INSERT DELAYED on MyISAM table Combined as Bug#16218. Added parameter 'keep_type' to Field::new_field(). Undid the change from Bug 13707 (Server crash with INSERT DELAYED on MyISAM table). I solved all four bugs in sql/sql_insert.cc by making exact duplicates of the fields. The new_field() method converts certain field types, which is wrong for INSERT DELAYED. |
||
|
unknown
|
17f724a18c |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-kt sql/field.cc: Auto merged sql/field.h: Auto merged |
||
|
unknown
|
c2575322c6 |
Merge mysql.com:/home/emurphy/src/bk-clean/tmp_merge
into mysql.com:/home/emurphy/src/bk-clean/mysql-5.1 mysql-test/mysql-test-run.sh: Auto merged mysql-test/valgrind.supp: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/insert_select.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select.test: Auto merged mysys/Makefile.am: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/mysqld.cc: Auto merged sql/opt_sum.cc: Auto merged sql/slave.cc: Auto merged sql/sql_select.cc: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged include/Makefile.am: manual merge mysql-test/r/func_time.result: manual merge mysql-test/r/select.result: manual merge |
||
|
unknown
|
c06d8fa1c7 |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-kt
into mysql.com:/usr/home/bar/mysql-5.1.b20086 mysql-test/t/partition_innodb.test: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged |
||
|
unknown
|
4e138572a0 |
Bug#20086: Can't get data from key partitioned tables with VARCHAR key
The problem appeared because the same values produced different hash during INSERT and SELECT for VARCHAR data type. Fix: VARCHAR required special treatment to avoid hashing of length bytes (leftmost one or two bytes) as well as trailing bytes beyond real length, which could contain garbage. Fix is done by introducing hash() - new method in the Field class. mysql-test/r/partition_innodb.result: Adding test case mysql-test/r/partition_pruning.result: Fixing test results (results differ due to changes in hash function) mysql-test/t/partition_innodb.test: Adding test case sql/field.cc: Adding generic hash() method, and a special method for VARCHAR. sql/field.h: Adding prototypes for new methods sql/key.cc: Mark columns for write before executinf of set_key_image(). Thanks for Mikael for suggesting this fix. sql/sql_partition.cc: Removing old hash code. Using new methid field->hash() instead. |
||
|
unknown
|
406a7ba992 |
field.cc, field.h:
Additional fix for #16377 for bigendian platforms sql_select.cc, select.result, select.test: After merge fix mysql-test/t/select.test: After merge fix mysql-test/r/select.result: After merge fix sql/sql_select.cc: After merge fix sql/field.h: Additional fix for #16377 for bigendian platforms sql/field.cc: Additional fix for #16377 for bigendian platforms |
||
|
unknown
|
610b1a4ebd |
Manually merged
configure.in: Auto merged client/mysqlbinlog.cc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/archive.result: Auto merged mysql-test/r/auto_increment.result: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_str.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/multi_update.result: Auto merged mysql-test/r/ndb_lock.result: Auto merged mysql-test/r/replace.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/archive.test: Auto merged mysql-test/t/auto_increment.test: Auto merged mysql-test/t/delayed.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/multi_update.test: Auto merged mysql-test/t/ndb_lock.test: Auto merged mysql-test/t/select.test: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_sum.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_lex.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_yacc.yy: Auto merged sql/structs.h: Auto merged storage/archive/ha_archive.cc: Auto merged tests/mysql_client_test.c: Auto merged |
||
|
unknown
|
89ce81ceed |
Bug #18895: BIT values cause joins to fail
The Field::eq() considered instances of Field_bit that differ only in bit_ptr/bit_ofs equal. This caused equality conditions optimization (build_equal_items_for_cond()) to make bad field substitutions that result in wrong predicates. Field_bit requires an overloaded eq() function that checks the bit_ptr/bit_ofs in addition to Field::eq(). mysql-test/r/select.result: Bug #18895: BIT values cause joins to fail - test case mysql-test/t/select.test: Bug #18895: BIT values cause joins to fail - test case sql/field.h: Bug #18895: BIT values cause joins to fail - eq() method overloaded for Field_bit |
||
|
unknown
|
01d03e7b4b |
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
BitKeeper/etc/ignore:
added mysys/test_bitmap
include/base64.h:
Removed my_global.h, as this must be included first in any program
include/heap.h:
Added heap_reset() (Required by new handler interface)
include/my_base.h:
Removed HA_EXTRA_RESET. MySQL will now call ::reset() instead of ::extra(HA_EXTRA_RESET).
HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIVE_PRIMARY key are deleted as the column bitmaps makes these unnecessary
include/my_bitmap.h:
Remove my_pthread.h (should be included at upper level)
Introduced my_bitmap_map typedef to make it the bitmap handling more like a black box
Added bitmap_is_overlapping(), bitmap_test_and_clear(), bitmap_copy() and bitmap_cmp()
Made bitmap_set_bit(), bitmap_flip_bit(), bitmap_clear_bit() return void
include/myisam.h:
Added mi_reset() (Required by new handler interface)
include/myisammrg.h:
Added myrg_reset() (Required by new handler interface)
include/mysql_com.h:
Added flag FIELD_IN_ADD_INDEX to be able to remove Field->add_index
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test:
Added testing of CREATE ... SELECT in a mixed environment
(This found some bugs that Mats is going to fix shortly)
mysql-test/install_test_db.sh:
Simplify ldata usage
Added --tmpdir=. option to mysqld bootstrap (Removed some warnings when TMPDIR was wrongly set)
mysql-test/mysql-test-run.pl:
Added --tmpdir=. to bootstrap
mysql-test/mysql-test-run.sh:
Use copy instead of INSTALL_DB for master and slave databases.
(Speeds up startup time a lot!)
Remove snapshot directories at startup (removes some strange warnings)
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Added testing of CREATE ... SELECT in a mixed environment
(This found some bugs that Mats is going to fix shortly)
mysql-test/r/binlog_stm_mix_innodb_myisam.result:
Added testing of CREATE ... SELECT in a mixed environment
mysql-test/r/create.result:
Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/r/federated.result:
Drop some left over tables
Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/r/func_gconcat.result:
Enable some disabled tests (converted them slightly to be predictable)
mysql-test/r/func_time.result:
Added drop of test function
mysql-test/r/innodb_mysql.result:
Added tests for CREATE ... SELECT
mysql-test/r/insert.result:
More tests
Added testing of duplicate columns in insert
mysql-test/r/loaddata.result:
Added testing LOAD DATA ... SET ...
mysql-test/r/multi_update.result:
Test multi updates and deletes using primary key and without
mysql-test/r/ndb_index_unique.result:
Better error message
mysql-test/r/ndb_replace.result:
New correct result after fixing REPLACE handling with NDB
mysql-test/r/rpl_ddl.result:
Now we don't get these (wrong) warnings anymore
mysql-test/r/view_grant.result:
Drop used views
mysql-test/t/create.test:
Some extra tests of warnings and number of tables opened by CREATE ... SELECT
mysql-test/t/federated.test:
Drop some left over tables
Added testing of multiple table update and multiple table delete (with and without keys)
mysql-test/t/func_gconcat.test:
Enable some disabled tests (converted them slightly to be predictable)
mysql-test/t/func_time.test:
Added drop of test function
mysql-test/t/innodb_mysql.test:
Added tests for CREATE ... SELECT
mysql-test/t/insert.test:
More tests
Added testing of duplicate columns in insert
mysql-test/t/loaddata.test:
Added testing LOAD DATA ... SET ...
mysql-test/t/multi_update.test:
Test multi updates and deletes using primary key and without
mysql-test/t/view_grant.test:
Drop used views
mysql-test/valgrind.supp:
Added supression of not needed warnings when printing stack trace
mysys/base64.c:
Include my_global.h first
mysys/my_bitmap.c:
Added bitmap_is_overlapping(), bitmap_test_and_clear() and bitmap_copy()
Changed logic of bitmap handling to be a bit more efficent (Did this together with Mikael Ronström)
Now the 'extra, not used bits' in the bitmap are assumed to have a 'random value' and the bitmap functions are free to change them whenever needed.
Changed how mutex is allocated to make 'bitmap_free()' function simpler.
mysys/thr_lock.c:
Added 0x before thread pointers (for easier comparison of DBUG traces)
sql/event.cc:
Ensure 'use_all_columns()' is used for event tables
Don't print warning that event table is damaged if it doesn't exists.
sql/field.cc:
Added ASSERT_COLUMN_MARKED_FOR_WRITE in all store() methods and ASSERT_COLUMN_MARKED_FOR_READ in all val() methods to catch wrong setting if table->read_set and table->write_set
(Rest of changes are only indentation cleanups)
sql/field.h:
Removed Field->query_id (replaced by table->read_set and table->write_set)
Removed Field->fieldnr (use Field->field_index instead)
Removed Field->add_index (Use Field->flags instead)
Add Field->part_of_key_not_clustered (for usage in opt_range.cc)
sql/filesort.cc:
Added paramater sort_postion to filesort() to force sorting by position instead of storing all fields in the result set.
This allowed me to remove checking of sql_command.
Create a temporary column bitmap for fields that are used by the sorting process.
Use column bitmaps instead of query_id
sql/ha_berkeley.cc:
Update to 'newer' table handler interface
sql/ha_berkeley.h:
Update to 'newer' table handler interface
sql/ha_federated.cc:
Update to 'newer' table handler interface
Only read columns that are needed from remote server.
In case of eq ranges, don't generate two conditions in the WHERE clause
(this can still be optimized, but would require a bigger code change)
Use 'simpler to use' XXXX_LEN' macros
A bit simpler logic in ::write_row() when creating statements.
In update, only include test of fields actually read.
(This greatly simplifies the queries sent by the federated engine)
Similar changes done for delete_row()
sql/ha_federated.h:
Update to 'newer' table handler interface
Changed XXX_LEN macros to use sizeof(...)-1, to simplify usage in ha_federated.cc
Added HA_PRIMARY_KEY_REQUIRED_FOR_DELETE to tell MySQL to read all primary key columns in case of DELETE
sql/ha_heap.cc:
Update to 'newer' table handler interface
sql/ha_heap.h:
Update to 'newer' table handler interface
sql/ha_innodb.cc:
Update to 'newer' table handler interface
- Update innobase_create_handler() to new interface
- Removed HA_NOT_EXACT_COUNT (not needed)
- Renamed HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- Prefixed base status variables with 'stats'
- Use table column bitmaps instead of ha_get_bit_in_read_set()
- Added ::reset(), with code from ::extra(HA_EXTRA_RESET)
- Removed HA_EXTRA_RETRIVE_ALL_COLS and HA_EXTRA_RETRIEVE_PRIMARY_KEY as
the table->read_set and table->write_set bitmaps now are accurate
sql/ha_innodb.h:
Update to 'newer' table handler interface
- table_flags are now ulonglong
- Added reset() method
- Removed not needed ha_retrieve_all_cols() and ha_retrieve_all_pk() columns.
- Made build_template() a class function to be able to easier access class variables
sql/ha_myisam.cc:
Update to 'newer' table handler interface
sql/ha_myisam.h:
Update to 'newer' table handler interface
sql/ha_myisammrg.cc:
Update to 'newer' table handler interface
sql/ha_myisammrg.h:
Update to 'newer' table handler interface
sql/ha_ndbcluster.cc:
Update to 'newer' table handler interface
Fixed use_blob_value() to be accurate
In ::complemented_read() we have to check both the read and write bitmap as the old code did mark all changed columns also in the read map
Correct dumping of field data with DBUG_DUMP
Prefix addresses in DBUG_PRINT with 0x
Fixed usage of not initialized memory
Update to use field->flags & FIELD_IN_ADD_INDEX instead of field->add_index.
sql/ha_ndbcluster.h:
Update to 'newer' table handler interface
sql/ha_ndbcluster_binlog.cc:
Mark usage of all columns in ndbcluster binlog tables
false -> FALSE, true -> TRUE
Use table->s->all_set instead of creating a temporary bitmap.
sql/ha_partition.cc:
Update to 'newer' table handler interface
Added memroot to initialise_partitions() and related functions to get faster memory allocation.
partition_create_handler() is now responsible for initialisation of the partition object
Some trivial optimizations and indentation fixes
Ensure that table_flags() are up to date
Removed documentation for removed HA_EXTRA flags
Fixed 'strange' usage of m_file[i] in new_handlers_from_part_info()that worked in current code 'by chance'
sql/ha_partition.h:
Update to 'newer' table handler interface
sql/handler.cc:
create_xxx handler now takes MEMROOT as an argument to simplify memory allocation.
Much simpler get_new_handler()
(Initialization of the object is now handled by the create method for the engine)
Moved all allocation of bitmap handling to the TABLE object (in table.cc)
Added column_bitmaps_signal() to signal column usage changes.
Changed binlog_log_row() to use the exiusting all_set bitmap in the table object.
Added ha_reset() function to test that the file object is ok at end of statement and call handler::reset()
Added use_hidden_primary_key() to signal handler that we we are going to read and update + delete the row and the handler should thus remember the position for the row
sql/handler.h:
Added HA_NO_TRANSACTIONS, HA_PARTIAL_COLUMN_READ, HA_REQUIRES_KEY_COLUMNS_FOR_DELETE,HA_PRIMARY_KEY_REQUIRED_FOR_DELETE and HA_HAS_RECORDS
Removed HA_NOT_EXACT_COUNT, HA_READ_RND_SAME
HA_DUPP_POS -> HA_DUPLICATE_POS
HA_NOT_EXACT_COUNT replaced by HA_STATS_RECORDS_IS_EXACT, HA_HAS_RECORDS and records()
HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION
Added future row type 'ROW_TYPE_PAGES'
Added MEM_ROOT to handlerton 'create' function
Added ha_statistics, a structure for all status variable in the base handler class.
Moved all status variables in the handler class into a stats structs to improve readability.
ha_table_flags() is now a cached (not virtual) version of table_flags()
reset() doesn't anymore call extra(HA_EXTRA_RESET) but is a function of it's own.
Renamed dupp_ref to dup_ref
Renamed not used handler::sortkey
Moved read_set and write_set to TABLE structure
handler::init() function added for cacheing of virtual constants from engine.
sql/item.cc:
Added register_field_in_read_map() for marking used columns in expression.
This is used by filesort() for creating an optimal column bitmap while retrieving columns for sorting.
Initalize value.cs_info.character_set_client to fix core dump bug with --debug
set_query_id -> mark_used_columns
Mark used columns in read_set OR write_set.
sql/item.h:
Removed reset_query_id_processor() as it's not needed anymore.
Added register_field_in_read_map()
Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
sql/item_cmpfunc.cc:
Temporary mark used columns to be read/writable
Update Item::walk to new interface
sql/item_cmpfunc.h:
Added extra argument to Item::walk() to indicate if we should also traverse sub queries.
sql/item_func.cc:
Update Item::walk() to new interface
table_flags() -> ha_table_flags()
sql/item_func.h:
Update Item::walk() to new interface
sql/item_row.cc:
Update Item::walk() to new interface
sql/item_row.h:
Update Item::walk() to new interface
sql/item_strfunc.h:
Update Item::walk() to new interface
sql/item_subselect.cc:
Added Item_subselect::walk()
(It was a bug it was missing before. Not sure what kind of bugs this could have caused)
sql/item_subselect.h:
Update Item::walk() to new interface
sql/item_sum.cc:
Update Item::walk() to new interface
Updates for new handler interace
sql/item_sum.h:
Update Item::walk() to new interface
sql/key.cc:
Updates for new handler interace
sql/log.cc:
Mark all columns used for log tables
Split options flag
Ensured that second argument to trans_register_ha is a bool
sql/log_event.cc:
Fixed comments to be withing 79 characters
Use OPTION_KEEP_LOG instead of OPTION_STATUS_NO_TRANS_UPDATE to remove wrong warnings
Updates for new handler interface
Use 0x%lx instead of %p (portability problem)
sql/mysql_priv.h:
Added OPTION_KEEP_LOG to indicate that we should replicate the binlog even on rollback
Removed not used 'conds' argument to setup_tables
sql/mysqld.cc:
Indentation fixes and removed old comment
sql/opt_range.cc:
Update to new handler and bitmap interface.
Fixed calls to cp_buffer_from_ref() and walk() (new argument).
Create new temporary bitmaps for ror scans.
(Needed because of handler changes and to get more accurate column bitmaps than before)
Remove not needed file->ha_reset() call before file->close().
Some trivial optimization and indentation fixes.
Use Field->part_of_key_not_clustered() to check if field is part of a key, instead of looping over all key parts.
Added flag 'in_ror_merged_scan' to allow ::get_next() to know that we need a special column bitmap to only fetch pointer to record.
This is needed because ror scan uses the same TABLE object but different file objects, which creates problem for the column bitmap handling.
(This is a temporary solution. A better one would be to allocate an own TABLE object for ROR scans)
Optimized bitmap handling in ror scans:
- Start bitmap at position 0, not 1
- Use same bitmap size as in TABLE
- Use table->read_set and table->write_set to create column bitmaps instead of looping over all fields in table
sql/opt_range.h:
Added 'in_ror_merged_scan' to indicate if we are doing a ROR scan
Added temporary column bitmaps used in ROR scans
sql/opt_sum.cc:
Added get_ext_record_count() which is used in COUNT() optimization if handler has HA_HAS_RECORDS
Note that we don't call this if handler has HA_STATS_RECORDS_IS_EXACT set.
sql/protocol.cc:
We need to mark columns as readable in ::store() as we sometimes return default value for fields to the user
sql/records.cc:
Updates for new handler interface
sql/set_var.cc:
Handle splitting OPTION_STATUS_NO_TRANS_UPDATE to two flags
sql/share/errmsg.txt:
Fixed wrong
sql/sp.cc:
Mark that we are using all columns for the proc table
Update call to setup_tables() to use new prototype
sql/sp_head.cc:
Removed QQ comment
sql/spatial.cc:
Removed wrong QQ comment
sql/sql_acl.cc:
Mark that we need all columns for acl tables
Supply memroot to some 'new' calls.
Indentation fixes
sql/sql_base.cc:
set_query_id removed
Ensure we call ha_reset() at end of each statement
Mark read columns in read_set and changed columns in write_set (Before all columns was marked in read set)
Fixed marking of some columns that was not proplerly marked before
Maintain in TABLE->merge_keys set of all keys that are used in some way
Removed not used 'conds' argument from setup_tables()
Remove not used setting of 'dupp_field' in insert_fields()
Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after crash)
sql/sql_bitmap.h:
Added is_overlapping()
sql/sql_class.cc:
Slow_logs was not properly initialized, which could maybe cause extra/lost entries in slow log.
set_query_id -> mark_used_columns
Simpler variable usage in pack_row() (cleanup)
Moved some variable declartion at start of function for better code readability
sql/sql_class.h:
Added enum_mark_columns
Updated comments
Renamed dupp_field -> dup_field
Added virtual function 'can_rollback_data()' to select_insert() to be used in CREATE ... SELECT to optimize use of OPTION_STATUS_NO_TRANS_UPDATE.
(This fixes a bug in CREATE ... SELECT where we did give wrong warnings when using non transacational tables)
sql/sql_delete.cc:
Updates to new handler interface
Call table->mark_columns_needed_for_delete() to allow us to put additional columns in column usage maps if handler so requires.
Call table->prepare_for_position() to tell handler that we are going to call ha_position().
Removed call to free_io_cache(). (io_cache is now removed in ha_reset()).
Fixed calls to setup_tables()
sql/sql_do.cc:
Update call to setup_fields()
sql/sql_handler.cc:
Tell handler tables to always read all columns.
Use temporary column map when storing value in field for later index usage
sql/sql_help.cc:
Makr all used fields to be read
Update call to setup_fields()
sql/sql_insert.cc:
Tell handler we are going to update the auto_increment column
dupp_field -> dup_field
Set column usage bits for timestamp field.
Call table->mark_columns_needed_for_insert() and table->mark_auto_increment_column()
Removed not used argument from mysql_prepare_insert_check_table().
If we get an duplicate row on insert, change column map to read and write all columns while retrying the operatation.
This is required by the definition of REPLACE and also ensures that fields that are only part of UPDATE are properly handled.
This fixed a bug in NDB and REPLACE where REPLACE wrongly copied some column values from the replaced row.
Setup new bitmaps for delayed insert rows
Remove reseting of next_number_fields as it will be reset on next call to handler_insert()
Fixed usage of thd->options and OPTION_STATUS_NO_TRANS_UPDATE.
The issue was that one should not to reset this flag as it may be set by a previous statement.
The way it was now used caused us to loose some warnings and get other wrong warnings when using non transactional tables mixed with transactional.
I fixed it by introducing 'select_insert::can_rollback_data' to inform send_error() that the given statement can be rolled back (which in case of CREATE TABLE can always be done)
Don't close tables created with CREATE ... SELECT but keep them in the table cache.
Moved out MY_HOOKS from inside function (better readability)
sql/sql_load.cc:
Update to use new handler and column marking interface
Update using setup_tables()
sql/sql_olap.cc:
Update calls to setup_tables
Use enums instead of constants to setup_fields()
sql/sql_parse.cc:
Handle OPTION_KEEP_LOG:
- Set it on CREATE TEMPORARY TABLE / DROP TABLE
- Reset it when OPTION_STATUS_NO_TRANS_UPDATE is reset
- Don't set it for CREATE ... SELECT (this is handled in select_create class)
Remove reseting of OPTION_STATUS_NO_TRANS_UPDATE in begin_trans() as this should already be reset.
If in autocommit mode, reset OPTION_KEEP_LOG and OPTION_STATUS_NO_TRANS_UPDATE to not give warnings in future commands
sql/sql_partition.cc:
Update walk() usage
Trivial indentation fixes
sql/sql_plugin.cc:
Mark all columns as used for plugins
sql/sql_prepare.cc:
Added assert to find out hidden bugs in character_set_client (got an error in debug binary when this not set correctly)
Updates for new handler interface
Update calls to setup_fields()
sql/sql_repl.cc:
Indentation fixes
sql/sql_select.cc:
Update call to setup_tables() and setup_fields()
Remove some old disabled code
Update to new hadler interface
Indentation cleanups
Added column bitmaps for temporary tables.
Remove updating of the removed slots in the Field class
Added TABLE argument to cp_buffer_from_ref() (To be able to install temporary column maps)
For internal temporary tables, use handler::write_row(), handler::delete_row() and handler::update_row() instead of handler::ha_xxxx() for faster execution.
sql/sql_select.h:
Indentaition fixes.
Install temporary column usage maps when needed
Added TABLE element to cp_buffer_from_ref()
sql/sql_show.cc:
Update to new handler interface
Mark all columns used for internal tables.
Style fixes.
Added support for 'future' ROW_TYPE_PAGES.
Don't allocate TMP_TABLE_PARAM with calloc. The 'init()' function will initialize the structure properly.
sql/sql_table.cc:
Update to new handler interface
Simple my_snprintf -> strmake()
Changed some constants to defines
Don't test for NULL in primary key (as we a couple of line above force the PRIMARY KEY to be NOT NULL)
Change field->add_index to use field->flags & FIELD_IN_ADD_INDEX
Mark all columns as used for ALTER TABLE
Style fixes
Update call to filesort()
sql/sql_trigger.h:
Added friend functions to be able to test if triggers exists for table we are going to insert/update or delete in.
sql/sql_udf.cc:
Mark all columns as used for udf system table.
sql/sql_union.cc:
Update call to walk()
Update to new handler interface
sql/sql_update.cc:
Remove query_id argument from compare_record()
Use column bitmaps instead of query_id.
We can't use compare_records() to skip updates for handlers that returns a partial column set and the read_set doesn't cover all columns in the write set, because compare_record() can't in this case know if a not read column changed value.
Update call to setup_fields()
Using separate column read and write sets allows for easier checking of timestamp field was set by statement.
Removed call to free_io_cache() as this is now done in ha_reset()
Call table->mark_columns_needed_for_update() and table->prepare_for_position()
Style fixes
sql/sql_view.cc:
Style fixes
sql/table.cc:
Remove implicitely include 'errno.h'
Remove code for building normalized path, as this is now identical to 'path'
Remove field->fieldnr
Added update of field->part_of_key_not_clustered()
Create column bitmaps in TABLE and TABLE_SHARE
Don't setup a temporary MEM_ROOT object as a thread specific variable for the handler. Instead we send the to-be-used MEMROOT to get_new_handler()
Update to new handler interface
Update call to walk()
Added new functions:
- st_table::clear_column_bitmaps()
- st_table::prepare_for_position()
- st_table::mark_columns_used_by_index()
- st_table::restore_column_maps_after_mark_index()
- st_table::mark_columns_used_by_index_no_reset()
- st_table::mark_auto_increment_column()
- st_table::mark_columns_needed_for_delete()
- st_table::mark_columns_needed_for_update()
- st_table::mark_columns_needed_for_insert()
sql/table.h:
Moved column usage bitmaps from handler to TABLE
Added to TABLE_SHARE all_set and column_bitmap_size
Added to TABLE merge_keys, bitmap_init_values, def_read_set, def_write_set, tmp_set, read_set and write_set.
Declared all new table column bitmap functions
Added TABLE functions column_bitmaps_set(), column_bitmaps_set_no_signal(), use_all_columns() and default_column_bitmaps()
Added functions: tmp_use_all_columns() and tmp_restore_column_map() to temporarly switch column bitmaps
Added functions: dbug_tmp_use_all_columns() and dbug_tmp_restore_column_map() to temporarly switch column bitmaps to avoid asserts in Field::store() and Field::val().
sql/tztime.cc:
Mark all columns as used for timezone tables
storage/archive/ha_archive.cc:
Update to new handler interface
storage/archive/ha_archive.h:
Update to new handler interface
storage/blackhole/ha_blackhole.cc:
Update to new handler interface
storage/blackhole/ha_blackhole.h:
Update to new handler interface
removed not needed flag HA_DUPP_POS
storage/csv/ha_tina.cc:
Update to new handler interface
storage/csv/ha_tina.h:
Update to new handler interface
storage/example/ha_example.cc:
Update to new handler interface
storage/example/ha_example.h:
Update to new handler interface
storage/heap/hp_extra.c:
Added heap_reset() (Required by new handler interface)
storage/heap/hp_test2.c:
Use heap_reset()
storage/myisam/ft_boolean_search.c:
Fixed compiler warning
storage/myisam/mi_extra.c:
Added mi_reset() (Required by new handler interface)
storage/myisam/mi_search.c:
Fixed DBUG_PRINT messages to use 0x%lx instead of %lx
storage/myisam/mi_test2.c:
Use mi_reset()
storage/myisam/myisampack.c:
Use mi_reset()
storage/myisammrg/myrg_extra.c:
Added myrg_reset() (Required by new handler interface)
unittest/mysys/base64.t.c:
Include my_global.h
Don't include implictely include file 'stdlib.h'
|
||
|
unknown
|
12a0f4ff14 |
Remove dflt_field from field structure as this was only needed when createing temporary table and I found another soultion that doesn't increase the size of the field structure for all table instances. (Better fix for bug #19089)
Fixed compiler warnings Fixed valgrind warning in Item_date_add_intervall::eq. (Recoding of bugfix #19490) sql/field.cc: remove dflt_field from field structure (not needed) Simple cleanup of code that been copied elsewhere sql/field.h: remove dflt_field from field structure (not needed) sql/item.h: Removed compiler warnings sql/item_timefunc.cc: Fixed Item_date_add_intervall::eq The problem was that when we call 'eq' 'this' is not fixed, which means we can't call const_item() or a value function. I fixed this so that we check eq for all arguments and that the sign and type are identical. (The original code gave a 'accessing uninitialized data' in valgrind. sql/mysql_priv.h: Added default fields to create_tmp_field sql/sql_insert.cc: New default_field parameter to create_tmp_field() sql/sql_select.cc: New default_field parameter to create_tmp_field() Use this in create_tmp_table() to set right default value for a field |
||
|
unknown
|
321708d36d |
Post-review fixes for bug #19089
mysql-test/r/view.result: Post-review fixes. sql/field.cc: Post-review fixes. sql/field.h: Post-review fixes. sql/sql_select.cc: Post-review fixes. |
||
|
unknown
|
db5d197414 |
Fixed bug #19089.
When a CREATE TABLE command created a table from a materialized view id does not inherit default values from the underlying table. Moreover the temporary table used for the view materialization does not inherit those default values. In the case when the underlying table contained ENUM fields it caused misleading error messages. In other cases the created table contained wrong default values. The code was modified to ensure inheritance of default values for materialized views. mysql-test/r/view.result: Added a test case for bug #19089. mysql-test/t/view.test: Added a test case for bug #19089. sql/field.cc: Fixed bug ##19089. Added field dflt_field to the class Field. This field is set for temp table fields that inherits default values of items from which they are created. sql/field.h: Fixed bug ##19089. Added field dflt_field to the class Field. This field is set for temp table fields that inherits default values of items from which they are created. sql/sql_select.cc: Fixed bug #19089. When a CREATE TABLE command created a table from a materialized view id does not inherit default values from the underlying table. Moreover the temporary table used for the view materialization does not inherit those default values. The code was modified to ensure inheritance of default values for materialized views. |
||
|
unknown
|
16105170c0 |
WL#3259 (RBR with more columns on slave than on master):
Added support for UPDATE. Some minor fixes. mysql-test/t/rpl_row_tabledefs_2myisam.test: Rename: mysql-test/t/rpl_row_tabledefs.test -> mysql-test/t/rpl_row_tabledefs_2myisam.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Extending test to ensure that there is one more null byte on slave than it is on the master. Some cleanup. sql/field.cc: Added support to find the last null byte for a field. sql/field.h: Added support to find the last null byte for a field. sql/log_event.cc: unpack_row() will now deduce the number of null bytes on the slave and use that when copying the null bytes from the row. Factored out code to copy "extra" record fields into separate function. Used that function to copy the "extra" fields when updating a row as well. mysql-test/r/rpl_row_tabledefs_2myisam.result: Result change mysql-test/r/rpl_row_tabledefs_3innodb.result: New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_3innodb.result'' mysql-test/r/rpl_row_tabledefs_7ndb.result: New BitKeeper file ``mysql-test/r/rpl_row_tabledefs_7ndb.result'' mysql-test/t/rpl_row_tabledefs_3innodb.test: New BitKeeper file ``mysql-test/t/rpl_row_tabledefs_3innodb.test'' |
||
|
unknown
|
12443de1b2 |
WL#3259 (RBR with more columns on slave than on master):
Extended replication to allow extra columns added last on slave as compared with table on master. mysql-test/extra/rpl_tests/rpl_row_tabledefs.test: Testing that replication can handle extra extra columns on slave. mysql-test/r/rpl_row_tabledefs.result: Result file change sql/Makefile.am: Adding new files. sql/field.cc: Implementing missing Field_bit::set_default() sql/field.h: Implementing missing Field_bit::set_default() sql/log_event.cc: Extending unpack_row() and replace_record() to handle the case when there are more columns on the slave than on the master. Especially handle BIT columns correctly. Using newly introduced table_def class to perform comparison. sql/log_event.h: Adding field to table_map_log_event. Changing prototype for do_prepare_row(). sql/mysql_priv.h: Adding include guards mysql-test/t/rpl_row_tabledefs.test: New BitKeeper file ``mysql-test/t/rpl_row_tabledefs.test'' sql/rpl_utility.cc: New BitKeeper file ``sql/rpl_utility.cc'' sql/rpl_utility.h: New BitKeeper file ``sql/rpl_utility.h'' |
||
|
unknown
|
050100dfca |
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into mysql.com:/home/jimw/my/mysql-5.1-clean mysql-test/r/type_bit.result: Auto merged mysql-test/r/type_bit_innodb.result: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/key.cc: Auto merged sql/field.cc: Resolve merge conflict |
||
|
unknown
|
15bec6c5e5 |
Merge bk-internal:/home/bk/mysql-5.0
into mysql.com:/home/jimw/my/mysql-5.0-clean sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_ndbcluster.cc: Auto merged |
||
|
unknown
|
7042df6228 | Manually merged | ||
|
unknown
|
af5e4098a8 |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into sunlight.local:/local_work/16281-bug-5.0-mysql sql/field.h: Auto merged |
||
|
unknown
|
0f8c11758d |
Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1
Mutli-table uses temporary table to store new values for fields. With the new values the rowid of the record to be updated is stored in a Field_string field. Table to be updated is set as source table of the rowid field. But when the temporary table creates the tmp field for the rowid field it converts it to a varstring field because the table to be updated was created by the v4.1. Due to this the stored rowids were broken and no records for update were found. The flag can_alter_field_type is added to Field_string class. When it is set to 0 the field won't be converted to varstring. The Field_string::type() function now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0. The multi_update::initialize_tables() function now sets can_alter_field_type flag to 0 for the rowid fields denying conversion of the field to a varstring field. sql/field.h: Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1 The flag can_alter_field_type is added to Field_string class. When it is set to 0 the field won't be converted to varstring. The Field_string::type() function now always returns MYSQL_TYPE_STRING if can_alter_field_type is set to 0. sql/sql_update.cc: Fixed bug #16281: Multi-table update broken in 5.0 on tables imported from 4.1 The multi_update::initialize_tables() function now sets can_alter_field_type flag to 0 for the rowid fields denying conversion of the field to a varstring field. |
||
|
unknown
|
b3b626c31c |
Bug #13601: Wrong int type for bit
The wrong value was being reported as the field_length for BIT fields, resulting in confusion for at least Connector/J. The field_length is now always the number of bits in the field, as it should be. mysql-test/r/type_bit.result: Add new results mysql-test/r/type_bit_innodb.result: Add new results mysql-test/t/type_bit.test: Add new regression test mysql-test/t/type_bit_innodb.test: Add new regression test sql/field.cc: Fix Field_bit->field_length to actually report the display width, and store the bytes stored in the rec in the new bytes_in_rec member. sql/field.h: Fix Field_bit::field_length to store the correct value, adding Field_bit::bytes_in_rec to remember the number of bytes used for storing the value. Remove Field_bit_as_char::create_length, as it is now redundant. sql/ha_ndbcluster.cc: Handle field_length of Field_bit actually being the display width (# of bits). sql/key.cc: Fix inappropriate use of field->field_length for BIT field. |
||
|
unknown
|
fb5677b8a0 |
Merge mysql.com:/opt/local/work/tmp_merge2
into mysql.com:/opt/local/work/mysql-5.1-merge mysql-test/r/ps.result: Auto merged mysql-test/r/sp-error.result: Auto merged mysql-test/r/sp-prelocking.result: Auto merged mysql-test/r/sp.result: Auto merged mysql-test/r/trigger.result: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp-error.test: Auto merged mysql-test/t/sp.test: Auto merged mysql-test/t/trigger.test: Auto merged sql/field.h: Auto merged sql/sp.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged mysql-test/t/sp-prelocking.test: Manual merge. |
||
|
unknown
|
d9f5fac9ed | Fix an -ansi -pedantic compilation failure | ||
|
unknown
|
442383892e |
Merge mysql.com:/extern/mysql/bk/mysql-5.0-runtime
into mysql.com:/extern/mysql/5.0/bug17015/mysql-5.0-runtime mysql-test/r/sp-error.result: Auto merged mysql-test/t/sp-error.test: Auto merged sql/field.h: Auto merged sql/sp.cc: Auto merged |
||
|
unknown
|
e550d6e7e3 |
Review fix for BUG#17015: Routine name truncation not an error
sql/field.h: Added new method to Field class: char_length() sql/sp.cc: Use Field::char_length() to check number of characters in the name field. |
||
|
unknown
|
3addd306a6 |
Merge
configure.in: Auto merged client/mysqlimport.c: Auto merged include/config-win.h: Auto merged mysql-test/r/create.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/disabled.def: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/field.h: Auto merged sql/log_event.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_partition.cc: Auto merged sql/sql_table.cc: Auto merged mysql-test/t/mysqldump.test: SCCS merged |
||
|
unknown
|
fedf61311b |
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0
into mysql.com:/users/lthalmann/bk/mysql-5.0-bug13418 sql/field.h: Auto merged |
||
|
unknown
|
f9804136bd |
BUG#13418: Virtualized some functions so that Bit_field class will use correct cmp functions
sql/field.h: Virtualized some functions so that Bit_field class will use correct cmp functions |