mirror of
https://github.com/MariaDB/server.git
synced 2025-05-08 15:01:49 +03:00
1178 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
unknown
|
4ec86b1c04 |
This is a cleanup of warnings that windows is complaining about.
client/mysql.cc: Windows warnings clean up server-tools/instance-manager/parse.cc: Cleanedup warning sql/field.cc: Removed unused variables sql/filesort.cc: Removed unused variables sql/ha_innodb.cc: Removed unused variables sql/ha_partition.cc: Fixing warning sql/partition_element.h: Fixing declaration for warnings |
||
unknown
|
f17a35a948 |
WL#3259 (RBR with more columns on slave than on master):
Post-merge fixes. mysql-test/r/rpl_row_tabledefs_3innodb.result: Result change mysql-test/t/disabled.def: Disabling test that appear to be fixed in other clones sql/field.cc: Post-merge fix sql/log_event.cc: Changes to unpack_row(): - Documentation - New parameter, the write/read set - R/W set now 0-indexed instead of 1-indexed - Removed column value printing Changes to replace_record(): - Documentation - Removed column value printing Removed unused function print_column_values() |
||
|
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
|
600f11552a | fix windows build | ||
|
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
|
f68085c4e7 |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Auto merged BitKeeper/deleted/.del-mysqld.dsp~ffdbf2d234e23e56: Auto merged BitKeeper/deleted/.del-mysys.dsp~32695fee91189326: Auto merged BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Auto merged BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Auto merged BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Auto merged client/mysql.cc: Auto merged client/mysqlbinlog.cc: Auto merged client/mysqlcheck.c: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged dbug/dbug.c: Auto merged extra/perror.c: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged extra/yassl/src/yassl_int.cpp: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_compress.result: Auto merged mysql-test/r/func_group.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/gis-rtree.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/im_daemon_life_cycle.result: Auto merged mysql-test/r/im_utils.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/mysqlcheck.result: Auto merged mysql-test/r/rpl_sp.result: Auto merged mysql-test/r/rpl_trigger.result: Auto merged mysql-test/r/sp-code.result: Auto merged mysql-test/r/sp-security.result: Auto merged mysql-test/r/strict.result: Auto merged mysql-test/r/type_blob.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/r/udf.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/cast.test: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/func_group.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/im_daemon_life_cycle.imtest: Auto merged mysql-test/t/im_life_cycle.imtest: Auto merged mysql-test/t/im_utils.imtest: Auto merged mysql-test/t/mysql.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/mysqlcheck.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/rpl_trigger.test: Auto merged mysql-test/t/sp-security.test: Auto merged mysql-test/t/strict.test: Auto merged mysql-test/t/udf.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/protocol.cc: Auto merged sql/slave.cc: Auto merged sql/sp.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_udf.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged sql-common/my_time.c: Auto merged sql/table.h: Auto merged storage/ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged mysql-test/r/im_life_cycle.result: e use local mysql-test/r/ps.result: use local client/Makefile.am: Manual merge. client/mysqlimport.c: Manual merge. configure.in: Manual merge. mysql-test/mysql-test-run.pl: Manual merge. mysql-test/r/mysqldump.result: Manual merge. mysql-test/r/mysqltest.result: Manual merge. mysql-test/r/ndb_basic.result: Manual merge. mysql-test/r/rpl_view.result: Manual merge. mysql-test/r/show_check.result: Manual merge. mysql-test/r/sp-error.result: Manual merge. mysql-test/r/sp.result: Manual merge. mysql-test/r/union.result: Manual merge. mysql-test/t/mysqldump.test: Manual merge. mysql-test/t/mysqltest.test: Manual merge. mysql-test/t/ndb_basic.test: Manual merge. mysql-test/t/rpl_sp.test: Manual merge. mysql-test/t/rpl_view.test: Manual merge. mysql-test/t/show_check.test: Manual merge. mysql-test/t/sp-error.test: Manual merge. mysql-test/t/sp.test: Manual merge. sql/item_sum.cc: Manual merge. sql/mysql_priv.h: Manual merge. sql/sp_head.cc: Manual merge. sql/sql_db.cc: Manual merge. sql/sql_delete.cc: Manual merge. sql/sql_lex.h: Manual merge. sql/sql_show.cc: Manual merge. sql/sql_table.cc: Manual merge. sql/sql_trigger.cc: Manual merge. sql/sql_yacc.yy: Manual merge. tests/mysql_client_test.c: Manual merge. |
||
unknown
|
22b92457fc |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822: Auto merged configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/warnings.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysqlbinlog.test: Auto merged mysql-test/t/udf.test: Auto merged mysql-test/t/warnings.test: Auto merged BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp.cc: Auto merged sql/sql_class.cc: Auto merged support-files/mysql.spec.sh: Auto merged mysql-test/r/sp.result: Manual merge. Place 5.0 test before 5.1 test. mysql-test/t/sp.test: Manual merge. Place 5.0 test before 5.1 test. mysys/my_bitmap.c: Manual merge. scripts/make_binary_distribution.sh: Manual merge. sql/Makefile.am: Manual merge. sql/slave.cc: Manual merge. sql/sql_class.h: Manual merge. sql/sql_parse.cc: Manual merge. sql/sql_select.cc: Manual merge. tests/mysql_client_test.c: Manual merge. |
||
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
|
ed44a2ee51 |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint client/mysql.cc: Auto merged client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged sql/field.cc: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_sum.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/func_group.result: Merge manually mysql-test/t/func_group.test: Merge manually |
||
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
|
1081dd6f0d |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint configure.in: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/date_formats.result: Auto merged mysql-test/r/federated.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/mysql.result: Auto merged mysql-test/r/type_ranges.result: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/mysql.test: Auto merged sql/field.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/item_subselect.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_yacc.yy: Auto merged |
||
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
|
b60272915f |
Merge siva.hindu.god:/usr/home/tim/m/bk/global-41
into siva.hindu.god:/usr/home/tim/m/bk/global-50 mysql-test/r/func_time.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/field.cc: Auto merged |
||
unknown
|
75220954bf |
Merge trift2.:/M41/clone-4.1
into trift2.:/M41/push-4.1 sql/field.cc: Auto merged sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul". |
||
unknown
|
9d5b76eba9 |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b16327 sql/field.cc: Auto merged mysql-test/r/func_time.result: merging mysql-test/t/func_time.test: merging |
||
|
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
|
03d411b1d1 |
Bug#6147: Traditional: Assigning a string to a numeric column has unexpected results
The problem was that when converting a string to an exact number, rounding didn't work, because conversion didn't understand approximate numbers notation. Fix: a new function for string-to-number conversion was implemented, which is aware of approxinate number notation (with decimal point and exponent, e.g. -19.55e-1) include/m_ctype.h: Adding new function into MY_CHARSET_HANDLER Adding prototypes for 8bit and ucs2 functions. mysql-test/r/loaddata.result: Fixing results mysql-test/r/ps_2myisam.result: Fixing results mysql-test/r/ps_3innodb.result: Fixing results mysql-test/r/ps_4heap.result: Fixing results mysql-test/r/ps_5merge.result: Fixing results mysql-test/r/ps_6bdb.result: Fixing results mysql-test/r/rpl_rewrite_db.result: Fixing results mysql-test/r/select.result: Fixing results mysql-test/r/sp-vars.result: Fixing results mysql-test/r/strict.result: Fixing results mysql-test/r/view.result: Fixing results mysql-test/r/warnings.result: Fixing results mysql-test/t/strict.test: Fixing results sql/field.cc: Using new function strings/ctype-big5.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-bin.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-cp932.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-euc_kr.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-eucjpms.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-gb2312.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-gbk.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-latin1.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-simple.c: Implementing my_strntoull10_8bit Adding new function into MY_CHARSET_HANDLER strings/ctype-sjis.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-tis620.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-ucs2.c: Implementing UCS2 wrapper for 8bit version Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-ujis.c: Adding new function into the MY_CHARSET_HANDLER structure strings/ctype-utf8.c: Adding new function into the MY_CHARSET_HANDLER structure mysql-test/r/round.result: New BitKeeper file ``mysql-test/r/round.result'' mysql-test/t/round.test: New BitKeeper file ``mysql-test/t/round.test'' |
||
|
unknown
|
d7c0c66706 |
Bug #21135 Crash in test "func_time"
- backport patch from 5.0 - "table" can be NULL in temporary fields used for type conversion sql/field.cc: table can be NULL in temporary fields used for type conversion. Store value in field as if db_low_byte_first was set. sql/field.h: table can be NULL in temporary fields used for type conversion. Store value in field as if db_low_byte_first was set. |
||
unknown
|
20c2ddaf0c |
Bug #19498: Inconsistent support for DEFAULT in TEXT columns
When a default of '' was specified for TEXT/BLOB columns, the specification was silently ignored. This is presumably to be nice to applications (or people) who generate their column definitions in a not-very-clever fashion. For clarity, doing this now results in a warning, or an error in strict mode. mysql-test/r/federated.result: Update results mysql-test/r/fulltext_distinct.result: Update results mysql-test/r/fulltext_update.result: Update results mysql-test/r/gis-rtree.result: Update results mysql-test/r/gis.result: Update results mysql-test/r/join_outer.result: Update results mysql-test/r/order_by.result: Update results mysql-test/r/type_blob.result: Add new results mysql-test/r/type_ranges.result: Update results mysql-test/t/type_blob.test: Add new test sql/field.cc: Issue a warning when setting '' as the default on a BLOB/TEXT column, and make it an error in strict mode. Also, clarify comments about when NO_DEFAULT_VALUE_FLAG is set. |
||
|
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
|
3924ab39f2 |
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 |
||
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
|
822e8866c7 |
Fixed bug #14896.
This bug in Field_string::cmp resulted in a wrong comparison with keys in partial indexes over multi-byte character fields. Given field a is declared as a varchar(16) collate utf8_unicode_ci INDEX(a(4)) gives us an example of such an index. Wrong key comparisons could lead to wrong result sets if the selected query execution plan used a range scan by a partial index over a utf8 character field. This also caused wrong results in many other cases. mysql-test/t/ctype_utf8.test: Added test cases for bug #14896. mysql-test/r/ctype_utf8.result: Added test cases for bug #14896. sql/field.cc: Fixed bug #14896. This bug in Field_string::cmp resulted in a wrong comparison with keys in partial indexes over multi-byte character fields. Given field a is declared as a varchar(16) collate utf8_unicode_ci INDEX(a(4)) gives us an example of such an index. Wrong key comparisons could lead to wrong result sets if the selected query execution plan used a range scan by a partial index over a utf8 character field. This also caused wrong results in many other cases. |
||
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
|
cd3fa2ee71 |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1 include/my_sys.h: Auto merged sql/field.cc: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/ha_ndbcluster_binlog.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_string.cc: Auto merged |
||
|
unknown
|
4b316e6fd6 |
unsigned char -> uchar
Added missing copyright Indentation and prototype fixes Fixed compiler warning include/my_sys.h: Fix prototype for my_print_open_files. Indentation fixes mysys/mf_keycache.c: Fix that key cache can be compiled without #define THREAD mysys/my_error.c: Indentation cleanups mysys/my_memmem.c: Added missing copyright. Fix include files sql/event.cc: unsigned char -> uchar sql/field.cc: unsigned char -> uchar sql/filesort.cc: Indentation fix sql/ha_ndbcluster.cc: unsigned char -> uchar sql/ha_ndbcluster_binlog.cc: unsigned char -> uchar sql/item_strfunc.cc: unsigned char -> uchar sql/log_event.cc: unsigned char -> uchar sql/opt_range.cc: Indentation fixes sql/sql_crypt.cc: unsigned char -> uchar sql/sql_string.cc: unsigned char -> uchar sql/tztime.cc: unsigned char -> uchar storage/heap/hp_extra.c: Clear also next_block (See heap_scan_init) storage/heap/hp_test2.c: Set required struct memeber max_table_size (Fixes that hp_test2 works again) storage/myisam/mi_rsamepos.c: Fixed bug in mi_rsame_with_pos strings/decimal.c: Fixed compiler warning |
||
|
unknown
|
9f8c532f0c |
rpl_log.test, rpl_stm_log.result:
Fixed failing test case field.cc, item_cmpfunc.cc, select.result: After merge fix mysql-test/r/select.result: After merge fix mysql-test/r/rpl_stm_log.result: Fixed failing test case sql/item_cmpfunc.cc: After merge fix sql/field.cc: After merge fix mysql-test/extra/rpl_tests/rpl_log.test: Fixed failing test case |
||
|
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
|
6f1605321d | remove wrong assert | ||
|
unknown
|
0237d9b0af |
String::set(double) and set(longlong) -> set_real() and set_int()
fix Field::store(double) being used instead of store(longlong) NB: overloading functions is evil |
||
unknown
|
eb21983453 |
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt sql/field.cc: Auto merged sql/opt_sum.cc: Auto merged |
||
|
unknown
|
b2f308160b |
Many files:
After merge fix mysql-test/r/func_time.result: After merge fix mysql-test/r/func_concat.result: After merge fix mysql-test/r/cast.result: After merge fix sql/item_cmpfunc.h: After merge fix sql/item_cmpfunc.cc: After merge fix sql/field.cc: After merge fix |
||
|
unknown
|
7c1748a1a4 | cleanup String::set(integer) | ||
|
unknown
|
9936533be9 |
Manually merged
mysql-test/r/cast.result: Auto merged mysql-test/t/func_time.test: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/opt_sum.cc: Auto merged sql/structs.h: Auto merged |
||
|
unknown
|
69e344e0b2 |
Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
into rurik.mysql.com:/home/igor/mysql-5.0-opt mysql-test/t/ctype_utf8.test: Auto merged sql/opt_sum.cc: Auto merged mysql-test/r/ctype_utf8.result: Manual merge sql/field.cc: Manual merge |
||
|
unknown
|
36b49259b1 |
Fixed bug #14896.
This bug in Field_string::cmp resulted in a wrong comparison with keys in partial indexes over multi-byte character fields. Given field a is declared as a varchar(16) collate utf8_unicode_ci INDEX(a(4)) gives us an example of such an index. Wrong key comparisons could lead to wrong result sets if the selected query execution plan used a range scan by a partial index over a utf8 character field. This also caused wrong results in many other cases. mysql-test/r/ctype_utf8.result: Added test cases for bug #14896. mysql-test/t/ctype_utf8.test: Added test cases for bug #14896. |
||
|
unknown
|
47311e8e87 |
Fixed bug#16377: result of DATE/TIME functions were compared as strings which
can lead to a wrong result. All date/time functions has the STRING result type thus their results are compared as strings. The string date representation allows a user to skip some of leading zeros. This can lead to wrong comparison result if a date/time function result is compared to such a string constant. The idea behind this bug fix is to compare results of date/time functions and data/time constants as ints, because that date/time representation is more exact. To achieve this the agg_cmp_type() is changed to take in the account that a date/time field or an date/time item should be compared as ints. This bug fix is partially back ported from 5.0. The agg_cmp_type() function now accepts THD as one of parameters. In addition, it now checks if a date/time field/function is present in the list. If so, it tries to coerce all constants to INT to make date/time comparison return correct result. The field for the constant coercion is taken from the Item_field or constructed from the Item_func. In latter case the constructed field will be freed after conversion of all constant items. Otherwise the result is same as before - aggregated with help of the item_cmp_type() function. From the Item_func_between::fix_length_and_dec() function removed the part which was converting date/time constants to int if possible. Now this is done by the agg_cmp_type() function. The new function result_as_longlong() is added to the Item class. It indicates that the item is a date/time item and result of it can be compared as int. Such items are date/time fields/functions. Correct val_int() methods are implemented for classes Item_date_typecast, Item_func_makedate, Item_time_typecast, Item_datetime_typecast. All these classes are derived from Item_str_func and Item_str_func::val_int() converts its string value to int without regard to the date/time type of these items. Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func() functions are changed to substitute result type of an item with the INT_RESULT if the item is a date/time item and another item is a constant. This is done to get a correct result of comparisons like date_time_function() = string_constant. mysql-test/r/cast.result: Fixed wrong test case result after bug fix#16377. sql/item_timefunc.h: Fixed bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. The result_as_longlong() function is set to return TRUE for these classes: Item_date, Item_date_func, Item_func_curtime, Item_func_sec_to_time, Item_date_typecast, Item_time_typecast, Item_datetime_typecast, Item_func_makedate. sql/item_timefunc.cc: Fixed bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result.Correct val_int() methods are implemented for classes Item_date_typecast, Item_func_makedate, Item_time_typecast, Item_datetime_typecast. sql/item_cmpfunc.h: Fixed bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. Arg_comparator::set_compare_func() and Arg_comparator::set_cmp_func() functions are changed to substitute result type of an item with the INT_RESULT if the item is a date/time item and another item is a constant. sql/field.cc: Fixed bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. Field::set_warning(), Field::set_datetime_warning() now use current_thd to get thd if table isn't set. sql/item_cmpfunc.cc: Fixed bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. The agg_cmp_type() function now accepts THD as one of parameters. In addition, it now checks if a date/time field/function is present in the list. If so, it tries to coerce all constants to INT to make date/time comparison return correct result. The field for the constant coercion is taken from the Item_field or constructed from the Item_func. In latter case the constructed field will be freed after conversion of all constant items. Otherwise the result is same as before - aggregated with help of the item_cmp_type() function. sql/item.h: The new function result_as_longlong() is added to the Item class. It indicates that the item is a date/time item and result of it can be compared as int. Such items are date/time fields/functions. mysql-test/t/func_time.test: Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. mysql-test/r/func_time.result: Added test case fot bug#16377: result of DATE/TIME functions were compared as strings which can lead to a wrong result. |