3288 Jorgen Loland 2010-11-25 [merge]
Local merge. No conflicts.
removed:
BUILD/Makefile.am
Docs/Makefile.am
EXCEPTIONS-CLIENT
Makefile.am
client/Makefile.am
cmake/Makefile.am
cmd-line-utils/Makefile.am
cmd-line-utils/libedit/Makefile.am
cmd-line-utils/readline/Makefile.am
config/
config/ac-macros/
config/ac-macros/alloca.m4
config/ac-macros/character_sets.m4
config/ac-macros/check_cpu.m4
config/ac-macros/compiler_flag.m4
config/ac-macros/dtrace.m4
config/ac-macros/gtest.m4
config/ac-macros/large_file.m4
config/ac-macros/maintainer.m4
config/ac-macros/misc.m4
config/ac-macros/plugins.m4
config/ac-macros/readline.m4
config/ac-macros/ssl.m4
config/ac-macros/zlib.m4
configure.in
dbug/Makefile.am
extra/Makefile.am
extra/yassl/Makefile.am
extra/yassl/src/Makefile.am
extra/yassl/taocrypt/Makefile.am
extra/yassl/taocrypt/benchmark/Makefile.am
extra/yassl/taocrypt/src/Makefile.am
extra/yassl/taocrypt/test/Makefile.am
extra/yassl/testsuite/Makefile.am
include/Makefile.am
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/acinclude.m4
libmysql_r/
libmysql_r/Makefile.am
libmysqld/Makefile.am
libmysqld/examples/Makefile.am
libservices/Makefile.am
man/Makefile.am
mysql-test/Makefile.am
mysql-test/collections/mysql-next-mr-rpl-merge.push
mysql-test/collections/mysql-next-mr-wl4445.push
mysql-test/collections/mysql-next-mr.push
mysql-test/lib/My/SafeProcess/Makefile.am
mysql-test/suite/innodb/r/innodb_bug54679.result
mysql-test/suite/innodb/r/innodb_bug56632.result
mysql-test/suite/innodb/t/innodb_bug54679.test
mysql-test/suite/innodb/t/innodb_bug56632.test
mysql-test/suite/perfschema/r/ddl_threads.result
mysql-test/suite/perfschema/r/dml_threads.result
mysql-test/suite/perfschema/r/thread_cache.result
mysql-test/suite/perfschema/t/ddl_threads.test
mysql-test/suite/perfschema/t/dml_threads.test
mysql-test/suite/perfschema/t/thread_cache.test
mysql-test/t/flush_read_lock_kill-master.opt
mysql-test/t/join_optimizer.test
mysys/Makefile.am
packaging/Makefile.am
plugin/Makefile.am
plugin/audit_null/Makefile.am
plugin/audit_null/plug.in
plugin/auth/Makefile.am
plugin/auth/plug.in
plugin/daemon_example/Makefile.am
plugin/daemon_example/configure.in
plugin/daemon_example/plug.in
plugin/fulltext/Makefile.am
plugin/fulltext/configure.in
plugin/fulltext/plug.in
plugin/semisync/Makefile.am
plugin/semisync/configure.in
plugin/semisync/plug.in
regex/Makefile.am
scripts/Makefile.am
scripts/make_sharedlib_distribution.sh
sql-bench/Makefile.am
sql-common/Makefile.am
sql/Makefile.am
sql/share/Makefile.am
storage/Makefile.am
storage/archive/Makefile.am
storage/archive/plug.in
storage/blackhole/Makefile.am
storage/blackhole/plug.in
storage/csv/Makefile.am
storage/csv/plug.in
storage/example/Makefile.am
storage/example/plug.in
storage/federated/Makefile.am
storage/federated/plug.in
storage/heap/Makefile.am
storage/heap/plug.in
storage/innobase/Makefile.am
storage/innobase/plug.in
storage/myisam/Makefile.am
storage/myisam/plug.in
storage/myisammrg/Makefile.am
storage/myisammrg/plug.in
storage/perfschema/Makefile.am
storage/perfschema/plug.in
storage/perfschema/unittest/Makefile.am
strings/Makefile.am
strings/bfill.c
strings/bmove.c
strings/longlong2str-x86.s
strings/longlong2str_asm.c
strings/my_strtoll10-x86.s
strings/str_test.c
strings/strings-x86.s
strings/strstr.c
strings/strto.c
strings/strtol.c
strings/strtoll.c
strings/strtoul.c
strings/strtoull.c
support-files/MacOSX/Makefile.am
support-files/Makefile.am
support-files/RHEL4-SElinux/Makefile.am
support-files/SCO/
support-files/SCO/INSTALL.sh
support-files/SCO/compile.sh
support-files/SCO/doc.sh
support-files/SCO/mkpkg.sh
support-files/SCO/patch
support-files/SCO/pkginfo.ini
support-files/SCO/postinstall
support-files/SCO/preinstall
support-files/SCO/preremove
support-files/SCO/prototype.ini
support-files/SCO/version
tests/Makefile.am
unittest/Makefile.am
unittest/examples/Makefile.am
unittest/gunit/Makefile.am
unittest/mysys/Makefile.am
unittest/mytap/Makefile.am
unittest/mytap/t/Makefile.am
unittest/strings/Makefile.am
vio/Makefile.am
win/Makefile.am
win/README
win/configure.js
win/create_manifest.js
win/mysql_manifest.cmake
zlib/Makefile.am
added:
VERSION
mysql-test/collections/mysql-trunk-bugfixing.daily
mysql-test/collections/mysql-trunk-bugfixing.push
mysql-test/extra/rpl_tests/rpl_change_master.test
mysql-test/extra/rpl_tests/rpl_crash_safe.inc
mysql-test/extra/rpl_tests/rpl_crash_safe.test
mysql-test/include/check_ftwrl_compatible.inc
mysql-test/include/check_ftwrl_incompatible.inc
mysql-test/include/not_master_info_table.inc
mysql-test/include/not_relay_log_info_table.inc
mysql-test/r/flush_read_lock.result
mysql-test/suite/binlog/r/binlog_variables_log_bin.result
mysql-test/suite/binlog/r/binlog_variables_log_bin_index.result
mysql-test/suite/binlog/r/binlog_variables_relay_log.result
mysql-test/suite/binlog/r/binlog_variables_relay_log_index.result
mysql-test/suite/binlog/t/binlog_variables_log_bin-master.opt
mysql-test/suite/binlog/t/binlog_variables_log_bin.test
mysql-test/suite/binlog/t/binlog_variables_log_bin_index-master.opt
mysql-test/suite/binlog/t/binlog_variables_log_bin_index.test
mysql-test/suite/binlog/t/binlog_variables_relay_log-master.opt
mysql-test/suite/binlog/t/binlog_variables_relay_log.test
mysql-test/suite/binlog/t/binlog_variables_relay_log_index-master.opt
mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
mysql-test/suite/innodb/r/innodb-create-options.result
mysql-test/suite/innodb/r/innodb_bug53046.result
mysql-test/suite/innodb/r/innodb_bug57904.result
mysql-test/suite/innodb/t/innodb-create-options.test
mysql-test/suite/innodb/t/innodb_bug53046.test
mysql-test/suite/innodb/t/innodb_bug57904.test
mysql-test/suite/rpl/r/rpl_change_master_crash_safe.result
mysql-test/suite/rpl/r/rpl_migration_crash_safe.result
mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result
mysql-test/suite/rpl/r/rpl_row_crash_safe.result
mysql-test/suite/rpl/r/rpl_stm_crash_safe.result
mysql-test/suite/rpl/t/rpl_change_master_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_change_master_crash_safe.test
mysql-test/suite/rpl/t/rpl_migration_crash_safe.test
mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test
mysql-test/suite/rpl/t/rpl_row_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_row_crash_safe.test
mysql-test/suite/rpl/t/rpl_stm_crash_safe-slave.opt
mysql-test/suite/rpl/t/rpl_stm_crash_safe.test
mysql-test/t/flush_read_lock.test
sql/rpl_info_table.cc
sql/rpl_info_table.h
sql/rpl_info_table_access.cc
sql/rpl_info_table_access.h
sql/rpl_info_values.cc
sql/rpl_info_values.h
storage/innobase/include/ut0bh.h
storage/innobase/lock/lock0wait.c
storage/innobase/ut/ut0bh.c
storage/perfschema/unittest/stub_server_misc.h
modified:
.bzr-mysql/default.conf
BUILD/FINISH.sh
BUILD/autorun.sh
BUILD/cmake_configure.sh
BUILD/compile-amd64-valgrind-max
BUILD/compile-pentium-valgrind-max
BUILD/compile-pentium-valgrind-max-no-ndb
BUILD/compile-pentium64-valgrind-max
CMakeLists.txt
README
client/client_priv.h
client/mysqlbinlog.cc
client/mysqldump.c
client/mysqltest.cc
cmake/build_configurations/mysql_release.cmake
cmake/do_abi_check.cmake
cmake/make_dist.cmake.in
cmake/mysql_version.cmake
cmake/os/Windows.cmake
cmake/os/WindowsCache.cmake
cmake/plugin.cmake
cmake/versioninfo.rc.in
cmd-line-utils/readline/bind.c
include/m_string.h
include/my_compiler.h
include/mysql.h
include/mysql_com.h
libmysql/conf_to_src.c
libmysql/errmsg.c
libmysql/get_password.c
libmysql/libmysql.c
libmysqld/CMakeLists.txt
mysql-test/collections/default.experimental
mysql-test/collections/default.weekly
mysql-test/extra/binlog_tests/binlog_truncate.test
mysql-test/extra/binlog_tests/blackhole.test
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/extra/rpl_tests/create_recursive_construct.inc
mysql-test/extra/rpl_tests/rpl_drop_create_temp_table.inc
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
mysql-test/extra/rpl_tests/rpl_insert_delayed.test
mysql-test/extra/rpl_tests/rpl_insert_id_pk.test
mysql-test/extra/rpl_tests/rpl_not_null.test
mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test
mysql-test/extra/rpl_tests/rpl_row_img.test
mysql-test/extra/rpl_tests/rpl_row_img_blobs.test
mysql-test/extra/rpl_tests/rpl_row_img_diff_indexes.test
mysql-test/extra/rpl_tests/rpl_stop_slave.test
mysql-test/include/check_slave_is_running.inc
mysql-test/include/check_slave_param.inc
mysql-test/include/ctype_numconv.inc
mysql-test/include/diff_tables.inc
mysql-test/include/handler.inc
mysql-test/include/have_example_plugin.inc
mysql-test/include/have_semisync_plugin.inc
mysql-test/include/have_simple_parser.inc
mysql-test/include/have_udf.inc
mysql-test/include/icp_tests.inc
mysql-test/include/mtr_warnings.sql
mysql-test/include/mysql_upgrade_preparation.inc
mysql-test/include/no_valgrind_without_big.inc
mysql-test/include/not_parallel.inc
mysql-test/include/rpl_assert.inc
mysql-test/include/rpl_chained_3_hosts.inc
mysql-test/include/rpl_diff_tables.inc
mysql-test/include/rpl_row_img_set.inc
mysql-test/include/setup_fake_relay_log.inc
mysql-test/include/show_rpl_debug_info.inc
mysql-test/include/show_slave_status.inc
mysql-test/include/truncate_file.inc
mysql-test/include/wait_for_binlog_event.inc
mysql-test/include/wait_for_slave_io_to_stop.inc
mysql-test/include/wait_for_slave_sql_to_stop.inc
mysql-test/include/wait_for_slave_to_stop.inc
mysql-test/include/wait_show_condition.inc
mysql-test/mysql-test-run.pl
mysql-test/r/1st.result
mysql-test/r/connect.result
mysql-test/r/ctype_binary.result
mysql-test/r/ctype_cp1251.result
mysql-test/r/ctype_latin1.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf8.result
mysql-test/r/delayed.result
mysql-test/r/events_2.result
mysql-test/r/flush.result
mysql-test/r/flush2.result
mysql-test/r/flush_read_lock_kill.result
mysql-test/r/func_math.result
mysql-test/r/func_misc.result
mysql-test/r/handler_innodb.result
mysql-test/r/handler_myisam.result
mysql-test/r/information_schema-big.result
mysql-test/r/information_schema.result
mysql-test/r/innodb_icp.result
mysql-test/r/innodb_icp_all.result
mysql-test/r/innodb_icp_none.result
mysql-test/r/kill.result
mysql-test/r/log_tables.result
mysql-test/r/log_tables_upgrade.result
mysql-test/r/mdl_sync.result
mysql-test/r/myisam_icp.result
mysql-test/r/myisam_icp_all.result
mysql-test/r/myisam_icp_none.result
mysql-test/r/mysql_upgrade.result
mysql-test/r/mysql_upgrade_ssl.result
mysql-test/r/mysqlcheck.result
mysql-test/r/mysqld--help-notwin.result
mysql-test/r/mysqld--help-win.result
mysql-test/r/mysqltest.result
mysql-test/r/not_embedded_server.result
mysql-test/r/partition.result
mysql-test/r/partition_debug_sync.result
mysql-test/r/partition_exchange.result
mysql-test/r/partition_innodb.result
mysql-test/r/plugin_auth.result
mysql-test/r/show_check.result
mysql-test/r/sp-lock.result
mysql-test/r/subquery_all.result
mysql-test/r/subquery_all_jcl6.result
mysql-test/r/subquery_nomat_nosj.result
mysql-test/r/subquery_nomat_nosj_jcl6.result
mysql-test/r/system_mysql_db.result
mysql-test/r/user_var.result
mysql-test/r/variables-big.result
mysql-test/r/variables-notembedded.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_base64_flag.result
mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test
mysql-test/suite/binlog/t/binlog_unsafe.test
mysql-test/suite/binlog/t/disabled.def
mysql-test/suite/federated/federated_bug_25714.test
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/is_key_column_usage.result
mysql-test/suite/funcs_1/r/is_statistics.result
mysql-test/suite/funcs_1/r/is_statistics_mysql.result
mysql-test/suite/funcs_1/r/is_table_constraints.result
mysql-test/suite/funcs_1/r/is_table_constraints_mysql.result
mysql-test/suite/funcs_1/r/is_tables_mysql.result
mysql-test/suite/innodb/r/innodb-zip.result
mysql-test/suite/innodb/r/innodb_mysql.result
mysql-test/suite/innodb/t/disabled.def
mysql-test/suite/innodb/t/innodb-zip.test
mysql-test/suite/innodb/t/innodb_mysql.test
mysql-test/suite/parts/inc/part_exch_qa_1.inc
mysql-test/suite/parts/inc/part_exch_qa_13.inc
mysql-test/suite/parts/inc/partition_auto_increment.inc
mysql-test/suite/parts/r/partition_auto_increment_blackhole.result
mysql-test/suite/parts/r/partition_auto_increment_innodb.result
mysql-test/suite/parts/r/partition_auto_increment_memory.result
mysql-test/suite/parts/r/partition_auto_increment_myisam.result
mysql-test/suite/parts/r/partition_exch_qa_12.result*
mysql-test/suite/parts/r/partition_exch_qa_13.result
mysql-test/suite/parts/r/partition_exch_qa_1_innodb.result*
mysql-test/suite/parts/r/partition_exch_qa_1_myisam.result*
mysql-test/suite/parts/t/partition_exch_qa_12.test
mysql-test/suite/perfschema/r/dml_setup_instruments.result
mysql-test/suite/perfschema/r/func_mutex.result
mysql-test/suite/perfschema/r/global_read_lock.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
mysql-test/suite/perfschema/r/server_init.result
mysql-test/suite/perfschema/t/func_file_io.test
mysql-test/suite/perfschema/t/func_mutex.test
mysql-test/suite/perfschema/t/global_read_lock.test
mysql-test/suite/perfschema/t/server_init.test
mysql-test/suite/perfschema/t/setup_actors.test
mysql-test/suite/perfschema/t/threads_mysql.test
mysql-test/suite/perfschema_stress/t/modify.test
mysql-test/suite/perfschema_stress/t/setup.test
mysql-test/suite/perfschema_stress/t/work.test
mysql-test/suite/rpl/r/rpl_change_master.result
mysql-test/suite/rpl/r/rpl_flushlog_loop.result
mysql-test/suite/rpl/r/rpl_tmp_table_and_DDL.result
mysql-test/suite/rpl/r/rpl_variables.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_change_master.test
mysql-test/suite/rpl/t/rpl_concurrency_error.test
mysql-test/suite/rpl/t/rpl_delayed_slave.test
mysql-test/suite/rpl/t/rpl_flushlog_loop.test
mysql-test/suite/rpl/t/rpl_heartbeat.test
mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
mysql-test/suite/rpl/t/rpl_packet.test
mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test
mysql-test/suite/rpl/t/rpl_rotate_logs.test
mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
mysql-test/suite/rpl/t/rpl_semi_sync.test
mysql-test/suite/rpl/t/rpl_semi_sync_event.test
mysql-test/suite/rpl/t/rpl_server_uuid.test
mysql-test/suite/rpl/t/rpl_show_master_info_file.test
mysql-test/suite/rpl/t/rpl_slow_query_log.test
mysql-test/suite/rpl/t/rpl_ssl.test
mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
mysql-test/suite/rpl/t/rpl_sync.test
mysql-test/suite/rpl/t/rpl_variables.test
mysql-test/suite/sys_vars/r/all_vars.result
mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
mysql-test/suite/sys_vars/t/master_info_repository_basic.test
mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
mysql-test/suite/sys_vars/t/slow_launch_time_func.test
mysql-test/t/change_user.test
mysql-test/t/delayed.test
mysql-test/t/disabled.def
mysql-test/t/events_2.test
mysql-test/t/execution_constants.test
mysql-test/t/fix_priv_tables.test
mysql-test/t/flush.test
mysql-test/t/flush2.test
mysql-test/t/flush_block_commit.test
mysql-test/t/flush_block_commit_notembedded.test
mysql-test/t/flush_read_lock_kill.test
mysql-test/t/func_math.test
mysql-test/t/func_misc.test
mysql-test/t/kill.test
mysql-test/t/lock_multi.test
mysql-test/t/mdl_sync.test
mysql-test/t/mysqltest.test
mysql-test/t/named_pipe.test
mysql-test/t/not_embedded_server.test
mysql-test/t/partition.test
mysql-test/t/partition_debug_sync.test
mysql-test/t/partition_exchange.test
mysql-test/t/partition_innodb.test
mysql-test/t/plugin_auth.test
mysql-test/t/server_uuid.test
mysql-test/t/shm.test
mysql-test/t/show_check.test
mysql-test/t/sp-lock.test
mysql-test/t/system_mysql_db_fix40123.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysql-test/t/trigger_notembedded.test
mysql-test/t/user_var.test
mysql-test/t/variables-big.test
mysql-test/t/variables-notembedded.test
mysql-test/t/xml.test
mysql-test/valgrind.supp
mysys/default.c
mysys/mf_iocache.c
mysys/mf_keycache.c
mysys/my_rdtsc.c
packaging/WiX/create_msi.cmake.in
packaging/WiX/mysql_server.wxs.in
regex/regexec.c
scripts/make_binary_distribution.sh
scripts/make_win_bin_dist
scripts/mysql_install_db.pl.in
scripts/mysql_install_db.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_fix.sql
sql-common/client_plugin.c
sql/CMakeLists.txt
sql/binlog.cc
sql/binlog.h
sql/debug_sync.cc
sql/event_data_objects.cc
sql/event_data_objects.h
sql/event_db_repository.cc
sql/event_db_repository.h
sql/event_queue.cc
sql/events.cc
sql/events.h
sql/field.cc
sql/field.h
sql/field_conv.cc
sql/ha_ndbcluster.cc
sql/ha_partition.cc
sql/handler.cc
sql/handler.h
sql/item.cc
sql/item.h
sql/item_func.cc
sql/lock.cc
sql/lock.h
sql/log.cc
sql/log.h
sql/log_event.cc
sql/mdl.cc
sql/mdl.h
sql/mysqld.cc
sql/mysqld.h
sql/opt_range.cc
sql/opt_range.h
sql/protocol.cc
sql/records.cc
sql/rpl_handler.h
sql/rpl_info.h
sql/rpl_info_factory.cc
sql/rpl_info_factory.h
sql/rpl_info_file.cc
sql/rpl_info_file.h
sql/rpl_info_handler.cc
sql/rpl_info_handler.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/rpl_slave.cc
sql/rpl_slave.h
sql/server_ids.h
sql/share/errmsg-utf8.txt
sql/sp.cc
sql/sp.h
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_admin.cc
sql/sql_audit.h
sql/sql_base.cc
sql/sql_base.h
sql/sql_binlog.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_error.cc
sql/sql_error.h
sql/sql_handler.cc
sql/sql_handler.h
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_parse.cc
sql/sql_parse.h
sql/sql_partition.cc
sql/sql_partition_admin.cc
sql/sql_prepare.cc
sql/sql_priv.h
sql/sql_rename.cc
sql/sql_select.cc
sql/sql_show.cc
sql/sql_table.cc
sql/sql_table.h
sql/sql_trigger.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
sql/sys_vars.cc
sql/table.cc
sql/table.h
sql/transaction.cc
storage/innobase/CMakeLists.txt
storage/innobase/btr/btr0cur.c
storage/innobase/buf/buf0buddy.c
storage/innobase/buf/buf0buf.c
storage/innobase/buf/buf0lru.c
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/dict/dict0load.c
storage/innobase/dict/dict0stats.c
storage/innobase/fil/fil0fil.c
storage/innobase/fsp/fsp0fsp.c
storage/innobase/handler/ha_innodb.cc
storage/innobase/handler/handler0alter.cc
storage/innobase/ibuf/ibuf0ibuf.c
storage/innobase/include/btr0btr.h
storage/innobase/include/btr0btr.ic
storage/innobase/include/btr0cur.h
storage/innobase/include/buf0buf.h
storage/innobase/include/db0err.h
storage/innobase/include/dict0dict.h
storage/innobase/include/dict0mem.h
storage/innobase/include/dict0stats.h
storage/innobase/include/fil0fil.h
storage/innobase/include/lock0lock.h
storage/innobase/include/lock0lock.ic
storage/innobase/include/lock0priv.h
storage/innobase/include/lock0priv.ic
storage/innobase/include/os0sync.h
storage/innobase/include/os0sync.ic
storage/innobase/include/que0que.h
storage/innobase/include/que0que.ic
storage/innobase/include/read0read.h
storage/innobase/include/read0read.ic
storage/innobase/include/row0ins.h
storage/innobase/include/row0mysql.h
storage/innobase/include/row0purge.h
storage/innobase/include/row0row.h
storage/innobase/include/row0upd.h
storage/innobase/include/row0vers.h
storage/innobase/include/srv0srv.h
storage/innobase/include/sync0sync.h
storage/innobase/include/sync0sync.ic
storage/innobase/include/trx0purge.h
storage/innobase/include/trx0purge.ic
storage/innobase/include/trx0rec.h
storage/innobase/include/trx0roll.h
storage/innobase/include/trx0rseg.h
storage/innobase/include/trx0rseg.ic
storage/innobase/include/trx0sys.h
storage/innobase/include/trx0sys.ic
storage/innobase/include/trx0trx.h
storage/innobase/include/trx0trx.ic
storage/innobase/include/trx0types.h
storage/innobase/include/trx0undo.h
storage/innobase/include/univ.i
storage/innobase/include/usr0sess.h
storage/innobase/include/ut0rnd.ic
storage/innobase/lock/lock0iter.c
storage/innobase/lock/lock0lock.c
storage/innobase/log/log0log.c
storage/innobase/pars/pars0pars.c
storage/innobase/que/que0que.c
storage/innobase/read/read0read.c
storage/innobase/row/row0ins.c
storage/innobase/row/row0merge.c
storage/innobase/row/row0mysql.c
storage/innobase/row/row0purge.c
storage/innobase/row/row0sel.c
storage/innobase/row/row0umod.c
storage/innobase/row/row0undo.c
storage/innobase/row/row0upd.c
storage/innobase/row/row0vers.c
storage/innobase/srv/srv0mon.c
storage/innobase/srv/srv0srv.c
storage/innobase/srv/srv0start.c
storage/innobase/sync/sync0arr.c
storage/innobase/sync/sync0rw.c
storage/innobase/sync/sync0sync.c
storage/innobase/thr/thr0loc.c
storage/innobase/trx/trx0i_s.c
storage/innobase/trx/trx0purge.c
storage/innobase/trx/trx0rec.c
storage/innobase/trx/trx0roll.c
storage/innobase/trx/trx0rseg.c
storage/innobase/trx/trx0sys.c
storage/innobase/trx/trx0trx.c
storage/innobase/trx/trx0undo.c
storage/innobase/usr/usr0sess.c
storage/innobase/ut/ut0ut.c
storage/myisam/ft_nlq_search.c
storage/myisam/ha_myisam.cc
storage/myisammrg/myrg_open.c
storage/perfschema/pfs_global.h
storage/perfschema/pfs_instr.cc
storage/perfschema/pfs_instr.h
storage/perfschema/pfs_instr_class.cc
storage/perfschema/pfs_instr_class.h
storage/perfschema/pfs_lock.h
storage/perfschema/table_events_waits.cc
storage/perfschema/unittest/pfs-t.cc
storage/perfschema/unittest/pfs_instr-oom-t.cc
storage/perfschema/unittest/pfs_instr-t.cc
storage/perfschema/unittest/pfs_instr_class-oom-t.cc
storage/perfschema/unittest/pfs_instr_class-t.cc
support-files/CMakeLists.txt
support-files/MySQL-shared-compat.spec.sh
support-files/my-huge.cnf.sh
support-files/my-innodb-heavy-4G.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
support-files/my-small.cnf.sh
support-files/mysql.spec.sh
tests/mysql_client_test.c
unittest/gunit/CMakeLists.txt
unittest/gunit/mdl-t.cc
unittest/gunit/mdl_mytap-t.cc
unittest/unit.pl
=== modified file 'mysql-test/include/subquery_sj.inc'
--- a/mysql-test/include/subquery_sj.inc 2010-11-01 15:11:10 +0000
+++ b/mysql-test/include/subquery_sj.inc 2010-11-24 14:06:22 +0000
@@ -1494,8 +1494,6 @@ FROM t0
WHERE varchar_nokey IN (
SELECT t1 .varchar_key from t1
);
-# the two queries below show wrong results with loosescan,
-# this is tracked as BUG#54641
SELECT t0.int_key
FROM t0
WHERE t0.varchar_nokey IN (
@@ -1503,6 +1501,22 @@ WHERE t0.varchar_nokey IN (
FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
);
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+ SELECT t1_1 .varchar_key
+ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+ SELECT t1_1 .varchar_key
+ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+
+EXPLAIN
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
=== modified file 'mysql-test/r/subquery_sj_all.result'
--- a/mysql-test/r/subquery_sj_all.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_all.result 2010-11-24 14:06:22 +0000
@@ -3496,6 +3496,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3505,6 +3516,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_all_jcl6.result'
--- a/mysql-test/r/subquery_sj_all_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_all_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_all_jcl7.result'
--- a/mysql-test/r/subquery_sj_all_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_all_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_dupsweed.result'
--- a/mysql-test/r/subquery_sj_dupsweed.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_dupsweed.result 2010-11-24 14:06:22 +0000
@@ -3495,6 +3495,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3504,6 +3515,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_dupsweed_jcl6.result'
--- a/mysql-test/r/subquery_sj_dupsweed_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_dupsweed_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3499,6 +3499,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3508,6 +3519,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_dupsweed_jcl7.result'
--- a/mysql-test/r/subquery_sj_dupsweed_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_dupsweed_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3499,6 +3499,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3508,6 +3519,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_firstmatch.result'
--- a/mysql-test/r/subquery_sj_firstmatch.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_firstmatch.result 2010-11-24 14:06:22 +0000
@@ -3496,6 +3496,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3505,6 +3516,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_firstmatch_jcl6.result'
--- a/mysql-test/r/subquery_sj_firstmatch_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_firstmatch_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_firstmatch_jcl7.result'
--- a/mysql-test/r/subquery_sj_firstmatch_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_firstmatch_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start temporary
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; End temporary; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_loosescan.result'
--- a/mysql-test/r/subquery_sj_loosescan.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_loosescan.result 2010-11-24 14:06:22 +0000
@@ -3495,9 +3495,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3506,9 +3515,19 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_loosescan_jcl6.result'
--- a/mysql-test/r/subquery_sj_loosescan_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_loosescan_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3499,9 +3499,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3510,9 +3519,19 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_loosescan_jcl7.result'
--- a/mysql-test/r/subquery_sj_loosescan_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_loosescan_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3499,9 +3499,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3510,9 +3519,19 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
);
int_key
9
-9
-7
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; LooseScan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; FirstMatch(t1_1)
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_mat.result'
--- a/mysql-test/r/subquery_sj_mat.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_mat.result 2010-11-24 14:06:22 +0000
@@ -3496,6 +3496,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3505,6 +3516,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_mat_jcl6.result'
--- a/mysql-test/r/subquery_sj_mat_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_mat_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_mat_jcl7.result'
--- a/mysql-test/r/subquery_sj_mat_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_mat_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3500,6 +3500,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3509,6 +3520,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t1_1 index varchar_key varchar_key 9 NULL 2 Using where; Using index; Start materialize; Scan
+1 PRIMARY t1_2 index NULL int_key 5 NULL 2 Using index; End materialize
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_mat_nosj.result'
--- a/mysql-test/r/subquery_sj_mat_nosj.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_mat_nosj.result 2010-11-24 14:06:22 +0000
@@ -3718,6 +3718,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 SUBQUERY t1_1 index NULL varchar_key 9 NULL 2 Using where; Using index
+2 SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3727,6 +3738,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 SUBQUERY t1_1 index NULL varchar_key 9 NULL 2 Using where; Using index
+2 SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_none.result'
--- a/mysql-test/r/subquery_sj_none.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_none.result 2010-11-24 14:06:22 +0000
@@ -3644,6 +3644,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3653,6 +3664,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_none_jcl6.result'
--- a/mysql-test/r/subquery_sj_none_jcl6.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_none_jcl6.result 2010-11-24 14:06:22 +0000
@@ -3648,6 +3648,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3657,6 +3668,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, incremental buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'mysql-test/r/subquery_sj_none_jcl7.result'
--- a/mysql-test/r/subquery_sj_none_jcl7.result 2010-11-01 15:11:10 +0000
+++ b/mysql-test/r/subquery_sj_none_jcl7.result 2010-11-24 14:06:22 +0000
@@ -3648,6 +3648,17 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
SELECT t0.int_key
FROM t0, t2
WHERE t0.varchar_nokey IN (
@@ -3657,6 +3668,18 @@ FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1
int_key
9
7
+EXPLAIN
+SELECT t0.int_key
+FROM t0, t2
+WHERE t0.varchar_nokey IN (
+SELECT t1_1 .varchar_key
+FROM t1 AS t1_1 JOIN t1 AS t1_2 ON t1_1 .int_key
+);
+id select_type table type possible_keys key key_len ref rows Extra
+1 PRIMARY t2 system NULL NULL NULL NULL 1
+1 PRIMARY t0 ALL NULL NULL NULL NULL 20 Using where
+2 DEPENDENT SUBQUERY t1_1 ref varchar_key varchar_key 4 func 1 Using where; Using index
+2 DEPENDENT SUBQUERY t1_2 index NULL int_key 5 NULL 2 Using index; Using join buffer (BNL, regular buffers)
DROP TABLE t0, t1, t2;
# End of bug#46550
=== modified file 'sql/sql_select.cc'
--- a/sql/sql_select.cc 2010-11-24 22:20:27 +0000
+++ b/sql/sql_select.cc 2010-11-25 07:57:23 +0000
@@ -10503,9 +10503,13 @@ uint check_join_cache_usage(JOIN_TAB *ta
goto no_join_cache;
/* No join buffering if prevented by no_jbuf_after */
- if (!(i <= no_jbuf_after) || tab->loosescan_match_tab)
+ if (i > no_jbuf_after)
goto no_join_cache;
+ /* No join buffering if this semijoin nest is handled by loosescan */
+ if (tab_sj_strategy == SJ_OPT_LOOSE_SCAN)
+ goto no_join_cache;
+
/* Neither if semijoin Materialization */
if (sj_is_materialize_strategy(tab_sj_strategy))
goto no_join_cache;
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-trunk-bugfixing branch (jorgen.loland:3288) | Jorgen Loland | 25 Nov |
