List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:November 14 2010 1:27pm
Subject:bzr push into mysql-trunk-mtr branch (bjorn.munch:2983 to 2985)
View as plain text  
 2985 Bjorn Munch	2010-11-14 [merge]
      upmerge from 5.5-mtr

    modified:
      unittest/unit.pl
 2984 Bjorn Munch	2010-11-14 [merge]
      merge from trunk

    removed:
      mysql-test/r/join_optimizer.result
      mysql-test/r/optimizer_switch_eng_cond_pushdown1.result
      mysql-test/r/optimizer_switch_eng_cond_pushdown2.result
      mysql-test/r/subselect2.result
      mysql-test/r/subselect3.result
      mysql-test/r/subselect4.result
      mysql-test/suite/ibmdb2i/
      mysql-test/suite/ibmdb2i/include/
      mysql-test/suite/ibmdb2i/include/have_i54.inc
      mysql-test/suite/ibmdb2i/include/have_i61.inc
      mysql-test/suite/ibmdb2i/include/have_ibmdb2i.inc
      mysql-test/suite/ibmdb2i/r/
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44020.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44025.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44232.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_44610.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45196.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45793.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_45983.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_bug_49329.result
      mysql-test/suite/ibmdb2i/r/ibmdb2i_collations.result
      mysql-test/suite/ibmdb2i/t/
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44020.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44025.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44232.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_44610.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45196.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45793.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_45983.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_bug_49329.test
      mysql-test/suite/ibmdb2i/t/ibmdb2i_collations.test
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/t/innodb-system-table-view-master.opt
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/schema.test
      mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size-master.opt
      mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size-master.opt
      mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size-master.opt
      mysql-test/suite/sys_vars/r/engine_condition_pushdown_basic.result
      mysql-test/suite/sys_vars/r/have_csv_basic.result
      mysql-test/suite/sys_vars/r/have_innodb_basic.result
      mysql-test/suite/sys_vars/r/have_ndbcluster_basic.result
      mysql-test/suite/sys_vars/r/have_partitioning_basic.result
      mysql-test/suite/sys_vars/r/log_basic.result
      mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
      mysql-test/suite/sys_vars/r/sql_big_tables_basic.result
      mysql-test/suite/sys_vars/r/sql_big_tables_func.result
      mysql-test/suite/sys_vars/r/sql_low_priority_updates_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
      mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
      mysql-test/suite/sys_vars/t/engine_condition_pushdown_basic.test
      mysql-test/suite/sys_vars/t/have_csv_basic.test
      mysql-test/suite/sys_vars/t/have_innodb_basic.test
      mysql-test/suite/sys_vars/t/have_ndbcluster_basic.test
      mysql-test/suite/sys_vars/t/have_partitioning_basic.test
      mysql-test/suite/sys_vars/t/log_basic.test
      mysql-test/suite/sys_vars/t/log_slow_queries_basic.test
      mysql-test/suite/sys_vars/t/sql_big_tables_basic.test
      mysql-test/suite/sys_vars/t/sql_big_tables_func.test
      mysql-test/suite/sys_vars/t/sql_low_priority_updates_basic.test
      mysql-test/suite/sys_vars/t/sql_max_join_size_basic.test
      mysql-test/suite/sys_vars/t/sql_max_join_size_func.test
      mysql-test/t/join_optimizer.test
      mysql-test/t/optimizer_switch_eng_cond_pushdown1-master.opt
      mysql-test/t/optimizer_switch_eng_cond_pushdown1.test
      mysql-test/t/optimizer_switch_eng_cond_pushdown2-master.opt
      mysql-test/t/optimizer_switch_eng_cond_pushdown2.test
      mysql-test/t/subselect2.test
      mysql-test/t/subselect3.test
      mysql-test/t/subselect4.test
      pstack/
      pstack/Makefile.am
      pstack/aout/
      pstack/aout/Makefile.am
      pstack/aout/aout64.h
      pstack/aout/stab.def
      pstack/aout/stab_gnu.h
      pstack/bucomm.c
      pstack/bucomm.h
      pstack/budbg.h
      pstack/debug.c
      pstack/debug.h
      pstack/demangle.h
      pstack/filemode.c
      pstack/ieee.c
      pstack/ieee.h
      pstack/libiberty.h
      pstack/linuxthreads.c
      pstack/linuxthreads.h
      pstack/pstack.c
      pstack/pstack.h
      pstack/pstacktrace.h
      pstack/rddbg.c
      pstack/stabs.c
      storage/ibmdb2i/
      storage/ibmdb2i/CMakeLists.txt
      storage/ibmdb2i/Makefile.am
      storage/ibmdb2i/db2i_blobCollection.cc
      storage/ibmdb2i/db2i_blobCollection.h
      storage/ibmdb2i/db2i_charsetSupport.cc
      storage/ibmdb2i/db2i_charsetSupport.h
      storage/ibmdb2i/db2i_collationSupport.cc
      storage/ibmdb2i/db2i_collationSupport.h
      storage/ibmdb2i/db2i_constraints.cc
      storage/ibmdb2i/db2i_conversion.cc
      storage/ibmdb2i/db2i_errors.cc
      storage/ibmdb2i/db2i_errors.h
      storage/ibmdb2i/db2i_file.cc
      storage/ibmdb2i/db2i_file.h
      storage/ibmdb2i/db2i_global.h
      storage/ibmdb2i/db2i_iconv.h
      storage/ibmdb2i/db2i_ileBridge.cc
      storage/ibmdb2i/db2i_ileBridge.h
      storage/ibmdb2i/db2i_ioBuffers.cc
      storage/ibmdb2i/db2i_ioBuffers.h
      storage/ibmdb2i/db2i_misc.h
      storage/ibmdb2i/db2i_myconv.cc
      storage/ibmdb2i/db2i_myconv.h
      storage/ibmdb2i/db2i_rir.cc
      storage/ibmdb2i/db2i_safeString.h
      storage/ibmdb2i/db2i_sqlStatementStream.cc
      storage/ibmdb2i/db2i_sqlStatementStream.h
      storage/ibmdb2i/db2i_validatedPointer.h
      storage/ibmdb2i/ha_ibmdb2i.cc
      storage/ibmdb2i/ha_ibmdb2i.h
      storage/ibmdb2i/plug.in
      storage/innobase/COPYING
      storage/innobase/COPYING.Sun_Microsystems
      storage/innobase/handler/mysql_addons.cc
      storage/innobase/include/mysql_addons.h
      storage/innobase/include/ut0auxconf.h
      storage/innobase/mysql-test/
      storage/innobase/mysql-test/patches/
      storage/innobase/mysql-test/patches/README
      storage/innobase/mysql-test/patches/index_merge_innodb-explain.diff
      storage/innobase/mysql-test/patches/information_schema.diff
      storage/innobase/mysql-test/patches/innodb_change_buffering_basic.diff
      storage/innobase/mysql-test/patches/innodb_file_per_table.diff
      storage/innobase/mysql-test/patches/innodb_lock_wait_timeout.diff
      storage/innobase/mysql-test/patches/innodb_thread_concurrency_basic.diff
      storage/innobase/mysql-test/patches/partition_innodb.diff
      storage/innobase/ut/ut0auxconf_atomic_pthread_t_gcc.c
      storage/innobase/ut/ut0auxconf_atomic_pthread_t_solaris.c
      storage/innobase/ut/ut0auxconf_have_gcc_atomics.c
      storage/innobase/ut/ut0auxconf_have_solaris_atomics.c
      storage/innobase/ut/ut0auxconf_pause.c
      storage/innobase/ut/ut0auxconf_sizeof_pthread_t.c
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
      win/build-nmake-x64.bat
      win/build-nmake.bat
      win/build-vs71.bat
      win/build-vs8.bat
      win/build-vs8_x64.bat
      win/build-vs9.bat
      win/build-vs9_x64.bat
    added:
      include/mysql/client_plugin.h
      include/mysql/client_plugin.h.pp
      include/mysql/plugin_auth.h
      include/mysql/plugin_auth.h.pp
      include/mysql/plugin_auth_common.h
      include/welcome_copyright_notice.h
      mysql-test/extra/rpl_tests/rpl_filters.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/have_binlog_rows_query.inc
      mysql-test/include/have_engine_condition_pushdown.inc
      mysql-test/include/have_firstmatch.inc
      mysql-test/include/have_index_condition_pushdown.inc
      mysql-test/include/have_join_cache_level.inc
      mysql-test/include/have_loosescan.inc
      mysql-test/include/have_materialization.inc
      mysql-test/include/have_mrr.inc
      mysql-test/include/have_plugin_auth.inc
      mysql-test/include/have_plugin_interface.inc
      mysql-test/include/have_plugin_server.inc
      mysql-test/include/have_semijoin.inc
      mysql-test/include/icp_tests.inc
      mysql-test/include/join_cache.inc
      mysql-test/include/mrr_innodb_tests.inc
      mysql-test/include/mrr_tests.inc
      mysql-test/include/rpl_assert.inc
      mysql-test/include/rpl_chained_3_hosts.inc
      mysql-test/include/rpl_chained_3_hosts_sync.inc
      mysql-test/include/rpl_row_img_general_loop.inc
      mysql-test/include/rpl_row_img_parts_assertion.inc
      mysql-test/include/rpl_row_img_parts_master_slave.inc
      mysql-test/include/rpl_row_img_set.inc
      mysql-test/include/subquery_mat.inc
      mysql-test/include/subquery_sj.inc
      mysql-test/include/subquery_sj_innodb.inc
      mysql-test/include/world.inc
      mysql-test/include/world_schema.inc
      mysql-test/include/world_schema1.inc
      mysql-test/r/ctype_utf8mb4_uca.result
      mysql-test/r/func_in_icp.result
      mysql-test/r/func_in_icp_mrr.result
      mysql-test/r/func_in_mrr.result
      mysql-test/r/func_in_none.result
      mysql-test/r/gis-precise.result
      mysql-test/r/gis-rt-precise.result
      mysql-test/r/have_binlog_rows_query.require
      mysql-test/r/have_optimizer_switch.require
      mysql-test/r/innodb_icp.result
      mysql-test/r/innodb_icp_all.result
      mysql-test/r/innodb_icp_none.result
      mysql-test/r/innodb_mrr.result
      mysql-test/r/innodb_mrr_all.result
      mysql-test/r/innodb_mrr_icp.result
      mysql-test/r/innodb_mrr_none.result
      mysql-test/r/join_cache_jcl1.result
      mysql-test/r/join_cache_jcl2.result
      mysql-test/r/join_cache_jcl3.result
      mysql-test/r/join_cache_jcl4.result
      mysql-test/r/join_cache_jcl5.result
      mysql-test/r/join_cache_jcl6.result
      mysql-test/r/join_cache_jcl7.result
      mysql-test/r/join_cache_jcl8.result
      mysql-test/r/join_nested_jcl6.result
      mysql-test/r/join_optimizer.result
      mysql-test/r/join_outer_jcl6.result
      mysql-test/r/lowercase_table4.result
      mysql-test/r/myisam_icp.result
      mysql-test/r/myisam_icp_all.result
      mysql-test/r/myisam_icp_none.result
      mysql-test/r/myisam_mrr.result
      mysql-test/r/myisam_mrr_all.result
      mysql-test/r/myisam_mrr_icp.result
      mysql-test/r/myisam_mrr_none.result
      mysql-test/r/null_key_icp.result
      mysql-test/r/null_key_none.result
      mysql-test/r/optimizer_switch.result
      mysql-test/r/order_by_icp_mrr.result
      mysql-test/r/order_by_none.result
      mysql-test/r/plugin_auth.result
      mysql-test/r/plugin_auth_qa.result
      mysql-test/r/plugin_auth_qa_1.result
      mysql-test/r/plugin_auth_qa_2.result
      mysql-test/r/plugin_auth_qa_3.result
      mysql-test/r/plugin_load_option.result
      mysql-test/r/range_icp.result
      mysql-test/r/range_icp_mrr.result
      mysql-test/r/range_mrr.result
      mysql-test/r/range_none.result
      mysql-test/r/select_all_jcl6.result
      mysql-test/r/select_icp_mrr.result
      mysql-test/r/select_icp_mrr_jcl6.result
      mysql-test/r/select_none.result
      mysql-test/r/select_none_jcl6.result
      mysql-test/r/subquery_all_jcl6.result
      mysql-test/r/subquery_mat.result
      mysql-test/r/subquery_mat_all.result
      mysql-test/r/subquery_mat_none.result
      mysql-test/r/subquery_nomat_nosj.result
      mysql-test/r/subquery_nomat_nosj_jcl6.result
      mysql-test/r/subquery_none.result
      mysql-test/r/subquery_none_jcl6.result
      mysql-test/r/subquery_sj_all.result
      mysql-test/r/subquery_sj_all_jcl6.result
      mysql-test/r/subquery_sj_all_jcl7.result
      mysql-test/r/subquery_sj_dupsweed.result
      mysql-test/r/subquery_sj_dupsweed_jcl6.result
      mysql-test/r/subquery_sj_dupsweed_jcl7.result
      mysql-test/r/subquery_sj_firstmatch.result
      mysql-test/r/subquery_sj_firstmatch_jcl6.result
      mysql-test/r/subquery_sj_firstmatch_jcl7.result
      mysql-test/r/subquery_sj_innodb_all.result
      mysql-test/r/subquery_sj_innodb_all_jcl6.result
      mysql-test/r/subquery_sj_innodb_all_jcl7.result
      mysql-test/r/subquery_sj_innodb_none.result
      mysql-test/r/subquery_sj_innodb_none_jcl6.result
      mysql-test/r/subquery_sj_innodb_none_jcl7.result
      mysql-test/r/subquery_sj_loosescan.result
      mysql-test/r/subquery_sj_loosescan_jcl6.result
      mysql-test/r/subquery_sj_loosescan_jcl7.result
      mysql-test/r/subquery_sj_mat.result
      mysql-test/r/subquery_sj_mat_jcl6.result
      mysql-test/r/subquery_sj_mat_jcl7.result
      mysql-test/r/subquery_sj_mat_nosj.result
      mysql-test/r/subquery_sj_none.result
      mysql-test/r/subquery_sj_none_jcl6.result
      mysql-test/r/subquery_sj_none_jcl7.result
      mysql-test/std_data/bug57108.cnf
      mysql-test/std_data/parts/t1TIMESTAMP.frm
      mysql-test/suite/bugs/r/bug57108.result
      mysql-test/suite/bugs/t/bug57108-master.opt
      mysql-test/suite/bugs/t/bug57108.test
      mysql-test/suite/innodb/include/innodb_stats.inc
      mysql-test/suite/innodb/include/innodb_stats_bootstrap.inc
      mysql-test/suite/innodb/r/innodb-truncate.result
      mysql-test/suite/innodb/r/innodb_bug56143.result
      mysql-test/suite/innodb/r/innodb_bug56632.result
      mysql-test/suite/innodb/r/innodb_bug56680.result
      mysql-test/suite/innodb/r/innodb_bug56716.result
      mysql-test/suite/innodb/r/innodb_bug57252.result
      mysql-test/suite/innodb/r/innodb_bug57255.result
      mysql-test/suite/innodb/r/innodb_stats.result
      mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
      mysql-test/suite/innodb/t/innodb-truncate.test
      mysql-test/suite/innodb/t/innodb_bug56143.test
      mysql-test/suite/innodb/t/innodb_bug56632.test
      mysql-test/suite/innodb/t/innodb_bug56680.test
      mysql-test/suite/innodb/t/innodb_bug56716.test
      mysql-test/suite/innodb/t/innodb_bug57252.test
      mysql-test/suite/innodb/t/innodb_bug57255.test
      mysql-test/suite/innodb/t/innodb_stats.test
      mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
      mysql-test/suite/optimizer_unfixed_bugs/
      mysql-test/suite/optimizer_unfixed_bugs/README.txt
      mysql-test/suite/optimizer_unfixed_bugs/r/
      mysql-test/suite/optimizer_unfixed_bugs/r/bug42991.result
      mysql-test/suite/optimizer_unfixed_bugs/r/bug49129.result
      mysql-test/suite/optimizer_unfixed_bugs/t/
      mysql-test/suite/optimizer_unfixed_bugs/t/bug42991.test
      mysql-test/suite/optimizer_unfixed_bugs/t/bug49129.test
      mysql-test/suite/parts/inc/part_exch_drop_tabs.inc
      mysql-test/suite/parts/inc/part_exch_qa.inc
      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/part_exch_qa_4.inc
      mysql-test/suite/parts/inc/part_exch_qa_5.inc
      mysql-test/suite/parts/inc/part_exch_qa_7.inc
      mysql-test/suite/parts/inc/part_exch_qa_8.inc
      mysql-test/suite/parts/inc/part_exch_tabs.inc
      mysql-test/suite/parts/r/partition_exch_innodb.result
      mysql-test/suite/parts/r/partition_exch_myisam.result
      mysql-test/suite/parts/r/partition_exch_myisam_innodb.result
      mysql-test/suite/parts/r/partition_exch_qa.result
      mysql-test/suite/parts/r/partition_exch_qa_10.result
      mysql-test/suite/parts/r/partition_exch_qa_11.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_14.result
      mysql-test/suite/parts/r/partition_exch_qa_15.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/r/partition_exch_qa_2.result
      mysql-test/suite/parts/r/partition_exch_qa_3.result
      mysql-test/suite/parts/r/partition_exch_qa_4_innodb.result
      mysql-test/suite/parts/r/partition_exch_qa_4_myisam.result
      mysql-test/suite/parts/r/partition_exch_qa_5_innodb.result
      mysql-test/suite/parts/r/partition_exch_qa_5_myisam.result
      mysql-test/suite/parts/r/partition_exch_qa_6.result
      mysql-test/suite/parts/r/partition_exch_qa_7_innodb.result
      mysql-test/suite/parts/r/partition_exch_qa_7_myisam.result
      mysql-test/suite/parts/r/partition_exch_qa_8_innodb.result
      mysql-test/suite/parts/r/partition_exch_qa_8_myisam.result
      mysql-test/suite/parts/t/partition_exch_innodb.test
      mysql-test/suite/parts/t/partition_exch_myisam.test
      mysql-test/suite/parts/t/partition_exch_myisam_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa.test
      mysql-test/suite/parts/t/partition_exch_qa_10.test
      mysql-test/suite/parts/t/partition_exch_qa_11.test
      mysql-test/suite/parts/t/partition_exch_qa_12.test
      mysql-test/suite/parts/t/partition_exch_qa_13.test
      mysql-test/suite/parts/t/partition_exch_qa_14.test
      mysql-test/suite/parts/t/partition_exch_qa_15.test
      mysql-test/suite/parts/t/partition_exch_qa_1_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa_1_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_2.test
      mysql-test/suite/parts/t/partition_exch_qa_3.test
      mysql-test/suite/parts/t/partition_exch_qa_4_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa_4_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_5_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa_5_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_6.test
      mysql-test/suite/parts/t/partition_exch_qa_7_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa_7_myisam.test
      mysql-test/suite/parts/t/partition_exch_qa_8_innodb.test
      mysql-test/suite/parts/t/partition_exch_qa_8_myisam.test
      mysql-test/suite/perfschema/include/schema.inc
      mysql-test/suite/perfschema/r/ddl_setup_actors.result
      mysql-test/suite/perfschema/r/ddl_threads.result
      mysql-test/suite/perfschema/r/dml_setup_actors.result
      mysql-test/suite/perfschema/r/dml_threads.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
      mysql-test/suite/perfschema/r/setup_actors.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
      mysql-test/suite/perfschema/r/threads_innodb.result
      mysql-test/suite/perfschema/r/threads_insert_delayed.result
      mysql-test/suite/perfschema/r/threads_mysql.result
      mysql-test/suite/perfschema/t/ddl_setup_actors.test
      mysql-test/suite/perfschema/t/ddl_threads.test
      mysql-test/suite/perfschema/t/dml_setup_actors.test
      mysql-test/suite/perfschema/t/dml_threads.test
      mysql-test/suite/perfschema/t/schema_lc0.test
      mysql-test/suite/perfschema/t/schema_lc1.test
      mysql-test/suite/perfschema/t/schema_lc2.test
      mysql-test/suite/perfschema/t/setup_actors.test
      mysql-test/suite/perfschema/t/start_server_no_setup_actors-master.opt
      mysql-test/suite/perfschema/t/start_server_no_setup_actors.test
      mysql-test/suite/perfschema/t/threads_innodb.test
      mysql-test/suite/perfschema/t/threads_insert_delayed.test
      mysql-test/suite/perfschema/t/threads_mysql-master.opt
      mysql-test/suite/perfschema/t/threads_mysql.test
      mysql-test/suite/rpl/r/rpl_change_master_dbug.result
      mysql-test/suite/rpl/r/rpl_do_db_filter.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_filter_database.result
      mysql-test/suite/rpl/r/rpl_ignore_db_filter.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_insensitive.result
      mysql-test/suite/rpl/r/rpl_ignore_table_filter_sensitive.result
      mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result
      mysql-test/suite/rpl/r/rpl_row_ignorable_event.result
      mysql-test/suite/rpl/r/rpl_row_img_blobs.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_full.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_min.result
      mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_full.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_min.result
      mysql-test/suite/rpl/r/rpl_row_img_idx_noblob.result
      mysql-test/suite/rpl/r/rpl_row_img_misc.result
      mysql-test/suite/rpl/r/rpl_row_img_sanity.result
      mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result
      mysql-test/suite/rpl/r/rpl_show_errors.result
      mysql-test/suite/rpl/r/rpl_stop_slave.result
      mysql-test/suite/rpl/t/rpl_change_master_dbug.test
      mysql-test/suite/rpl/t/rpl_do_db_filter-slave.opt
      mysql-test/suite/rpl/t/rpl_do_db_filter.test
      mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive-master.opt
      mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive-slave.opt
      mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive.test
      mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-master.opt
      mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt
      mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test
      mysql-test/suite/rpl/t/rpl_filter_database-slave.opt
      mysql-test/suite/rpl/t/rpl_filter_database.test
      mysql-test/suite/rpl/t/rpl_ignore_db_filter-master.opt
      mysql-test/suite/rpl/t/rpl_ignore_db_filter-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_db_filter.test
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive-master.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive.test
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive-master.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive-slave.opt
      mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test
      mysql-test/suite/rpl/t/rpl_rewrite_db_filter-master.opt
      mysql-test/suite/rpl/t/rpl_rewrite_db_filter-slave.opt
      mysql-test/suite/rpl/t/rpl_rewrite_db_filter.test
      mysql-test/suite/rpl/t/rpl_row_ignorable_event-master.opt
      mysql-test/suite/rpl/t/rpl_row_ignorable_event-slave.opt
      mysql-test/suite/rpl/t/rpl_row_ignorable_event.test
      mysql-test/suite/rpl/t/rpl_row_img_blobs.cnf
      mysql-test/suite/rpl/t/rpl_row_img_blobs.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_full.cnf
      mysql-test/suite/rpl/t/rpl_row_img_eng_full.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_min.cnf
      mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
      mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.cnf
      mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_full.cnf
      mysql-test/suite/rpl/t/rpl_row_img_idx_full.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_min.cnf
      mysql-test/suite/rpl/t/rpl_row_img_idx_min.test
      mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.cnf
      mysql-test/suite/rpl/t/rpl_row_img_idx_noblob.test
      mysql-test/suite/rpl/t/rpl_row_img_misc.test
      mysql-test/suite/rpl/t/rpl_row_img_sanity.test
      mysql-test/suite/rpl/t/rpl_row_record_find_myisam.test
      mysql-test/suite/rpl/t/rpl_show_errors.test
      mysql-test/suite/rpl/t/rpl_stop_slave.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_img.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.cnf
      mysql-test/suite/rpl_ndb/t/rpl_ndb_row_img.test
      mysql-test/suite/sys_vars/inc/autocommit_func2.inc
      mysql-test/suite/sys_vars/r/autocommit_func2.result
      mysql-test/suite/sys_vars/r/autocommit_func3.result
      mysql-test/suite/sys_vars/r/bind_address_basic.result
      mysql-test/suite/sys_vars/r/binlog_row_image_basic.result
      mysql-test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result
      mysql-test/suite/sys_vars/r/external_user_basic.result
      mysql-test/suite/sys_vars/r/master_info_repository_basic.result
      mysql-test/suite/sys_vars/r/optimizer_join_cache_level_basic.result
      mysql-test/suite/sys_vars/r/pfs_setup_actors_size_basic.result
      mysql-test/suite/sys_vars/r/proxy_user_basic.result
      mysql-test/suite/sys_vars/r/relay_log_info_repository_basic.result
      mysql-test/suite/sys_vars/t/autocommit_func2-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func2.test
      mysql-test/suite/sys_vars/t/autocommit_func3-master.opt
      mysql-test/suite/sys_vars/t/autocommit_func3.test
      mysql-test/suite/sys_vars/t/bind_address_basic.test
      mysql-test/suite/sys_vars/t/binlog_row_image_basic.test
      mysql-test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test
      mysql-test/suite/sys_vars/t/external_user_basic.test
      mysql-test/suite/sys_vars/t/master_info_repository_basic.test
      mysql-test/suite/sys_vars/t/optimizer_join_cache_level_basic.test
      mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
      mysql-test/suite/sys_vars/t/proxy_user_basic.test
      mysql-test/suite/sys_vars/t/relay_log_info_repository_basic.test
      mysql-test/t/ctype_utf8mb4_uca.test
      mysql-test/t/func_in_all.test
      mysql-test/t/func_in_icp.test
      mysql-test/t/func_in_icp_mrr.test
      mysql-test/t/func_in_mrr.test
      mysql-test/t/func_in_none.test
      mysql-test/t/gis-precise.test
      mysql-test/t/gis-rt-precise.test
      mysql-test/t/innodb_icp.test
      mysql-test/t/innodb_icp_all.test
      mysql-test/t/innodb_icp_none.test
      mysql-test/t/innodb_mrr-master.opt
      mysql-test/t/innodb_mrr.test
      mysql-test/t/innodb_mrr_all-master.opt
      mysql-test/t/innodb_mrr_all.test
      mysql-test/t/innodb_mrr_icp-master.opt
      mysql-test/t/innodb_mrr_icp.test
      mysql-test/t/innodb_mrr_none-master.opt
      mysql-test/t/innodb_mrr_none.test
      mysql-test/t/join_cache_jcl1.test
      mysql-test/t/join_cache_jcl2.test
      mysql-test/t/join_cache_jcl3.test
      mysql-test/t/join_cache_jcl4.test
      mysql-test/t/join_cache_jcl5.test
      mysql-test/t/join_cache_jcl6.test
      mysql-test/t/join_cache_jcl7.test
      mysql-test/t/join_cache_jcl8.test
      mysql-test/t/join_nested_jcl6.test
      mysql-test/t/join_optimizer.test
      mysql-test/t/join_outer_jcl6.test
      mysql-test/t/lowercase_table4-master.opt
      mysql-test/t/lowercase_table4.test
      mysql-test/t/myisam_icp.test
      mysql-test/t/myisam_icp_all.test
      mysql-test/t/myisam_icp_none.test
      mysql-test/t/myisam_mrr.test
      mysql-test/t/myisam_mrr_all.test
      mysql-test/t/myisam_mrr_icp.test
      mysql-test/t/myisam_mrr_none.test
      mysql-test/t/null_key_all.test
      mysql-test/t/null_key_icp.test
      mysql-test/t/null_key_none.test
      mysql-test/t/optimizer_switch.test
      mysql-test/t/order_by_all.test
      mysql-test/t/order_by_icp_mrr.test
      mysql-test/t/order_by_none.test
      mysql-test/t/plugin_auth-master.opt
      mysql-test/t/plugin_auth.test
      mysql-test/t/plugin_auth_qa-master.opt
      mysql-test/t/plugin_auth_qa.test
      mysql-test/t/plugin_auth_qa_1-master.opt
      mysql-test/t/plugin_auth_qa_1.test
      mysql-test/t/plugin_auth_qa_2-master.opt
      mysql-test/t/plugin_auth_qa_2.test
      mysql-test/t/plugin_auth_qa_3-master.opt
      mysql-test/t/plugin_auth_qa_3.test
      mysql-test/t/plugin_load_option-master.opt
      mysql-test/t/plugin_load_option.test
      mysql-test/t/range_all.test
      mysql-test/t/range_icp.test
      mysql-test/t/range_icp_mrr.test
      mysql-test/t/range_mrr.test
      mysql-test/t/range_none.test
      mysql-test/t/select_all.test
      mysql-test/t/select_all_jcl6.test
      mysql-test/t/select_icp_mrr.test
      mysql-test/t/select_icp_mrr_jcl6.test
      mysql-test/t/select_none.test
      mysql-test/t/select_none_jcl6.test
      mysql-test/t/subquery_all.test
      mysql-test/t/subquery_all_jcl6.test
      mysql-test/t/subquery_mat.test
      mysql-test/t/subquery_mat_all.test
      mysql-test/t/subquery_mat_none.test
      mysql-test/t/subquery_nomat_nosj.test
      mysql-test/t/subquery_nomat_nosj_jcl6.test
      mysql-test/t/subquery_none.test
      mysql-test/t/subquery_none_jcl6.test
      mysql-test/t/subquery_sj_all.test
      mysql-test/t/subquery_sj_all_jcl6.test
      mysql-test/t/subquery_sj_all_jcl7.test
      mysql-test/t/subquery_sj_dupsweed.test
      mysql-test/t/subquery_sj_dupsweed_jcl6.test
      mysql-test/t/subquery_sj_dupsweed_jcl7.test
      mysql-test/t/subquery_sj_firstmatch.test
      mysql-test/t/subquery_sj_firstmatch_jcl6.test
      mysql-test/t/subquery_sj_firstmatch_jcl7.test
      mysql-test/t/subquery_sj_innodb_all.test
      mysql-test/t/subquery_sj_innodb_all_jcl6.test
      mysql-test/t/subquery_sj_innodb_all_jcl7.test
      mysql-test/t/subquery_sj_innodb_none.test
      mysql-test/t/subquery_sj_innodb_none_jcl6.test
      mysql-test/t/subquery_sj_innodb_none_jcl7.test
      mysql-test/t/subquery_sj_loosescan.test
      mysql-test/t/subquery_sj_loosescan_jcl6.test
      mysql-test/t/subquery_sj_loosescan_jcl7.test
      mysql-test/t/subquery_sj_mat.test
      mysql-test/t/subquery_sj_mat_jcl6.test
      mysql-test/t/subquery_sj_mat_jcl7.test
      mysql-test/t/subquery_sj_mat_nosj.test
      mysql-test/t/subquery_sj_none.test
      mysql-test/t/subquery_sj_none_jcl6.test
      mysql-test/t/subquery_sj_none_jcl7.test
      plugin/auth/
      plugin/auth/CMakeLists.txt
      plugin/auth/Makefile.am
      plugin/auth/auth_socket.c
      plugin/auth/dialog.c
      plugin/auth/plug.in
      plugin/auth/qa_auth_client.c
      plugin/auth/qa_auth_interface.c
      plugin/auth/qa_auth_server.c
      plugin/auth/test_plugin.c
      sql-common/client_plugin.c
      sql/gcalc_slicescan.cc
      sql/gcalc_slicescan.h
      sql/gcalc_tools.cc
      sql/gcalc_tools.h
      sql/plistsort.c
      sql/rpl_info.cc
      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/server_ids.h
      sql/sql_cmd.h
      sql/sql_join_cache.cc
      storage/innobase/dict/dict0stats.c
      storage/innobase/include/dict0priv.h
      storage/innobase/include/dict0priv.ic
      storage/innobase/include/dict0stats.h
      storage/innobase/scripts/
      storage/innobase/scripts/persistent_storage.sql
      storage/perfschema/pfs_defaults.cc
      storage/perfschema/pfs_defaults.h
      storage/perfschema/pfs_setup_actor.cc
      storage/perfschema/pfs_setup_actor.h
      storage/perfschema/table_setup_actors.cc
      storage/perfschema/table_setup_actors.h
      storage/perfschema/table_threads.cc
      storage/perfschema/table_threads.h
      unittest/gunit/dbug-t.cc
    renamed:
      config/ac-macros/ha_ndbcluster.m4 => storage/ndb/ndb_configure.m4
      mysql-test/r/func_in.result => mysql-test/r/func_in_all.result
      mysql-test/r/null_key.result => mysql-test/r/null_key_all.result
      mysql-test/r/order_by.result => mysql-test/r/order_by_all.result
      mysql-test/r/range.result => mysql-test/r/range_all.result
      mysql-test/r/select.result => mysql-test/r/select_all.result
      mysql-test/r/subselect.result => mysql-test/r/subquery_all.result
      mysql-test/t/func_in.test => mysql-test/include/func_in.inc
      mysql-test/t/null_key.test => mysql-test/include/null_key.inc
      mysql-test/t/order_by.test => mysql-test/include/order_by.inc
      mysql-test/t/range.test => mysql-test/include/range.inc
      mysql-test/t/select.test => mysql-test/include/select.inc
      mysql-test/t/subselect.test => mysql-test/include/subquery.inc
    modified:
      .bzrignore
      BUILD/SETUP.sh
      CMakeLists.txt
      Doxyfile-wl4895
      Makefile.am
      README
      client/CMakeLists.txt
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      client/sql_string.h
      cmake/abi_check.cmake
      cmake/build_configurations/mysql_release.cmake
      cmake/install_layout.cmake
      cmake/mysql_version.cmake
      cmake/os/Linux.cmake
      cmake/os/WindowsCache.cmake
      cmd-line-utils/libedit/common.c
      cmd-line-utils/libedit/readline.c
      cmd-line-utils/libedit/vi.c
      cmd-line-utils/readline/complete.c
      cmd-line-utils/readline/histexpand.c
      cmd-line-utils/readline/histfile.c
      cmd-line-utils/readline/isearch.c
      cmd-line-utils/readline/parens.c
      cmd-line-utils/readline/readline.c
      cmd-line-utils/readline/terminal.c
      cmd-line-utils/readline/text.c
      config.h.cmake
      config/ac-macros/maintainer.m4
      configure.cmake
      configure.in
      dbug/dbug.c
      include/Makefile.am
      include/errmsg.h
      include/m_ctype.h
      include/my_base.h
      include/my_compiler.h
      include/my_dbug.h
      include/my_getopt.h
      include/my_global.h
      include/my_handler.h
      include/my_no_pthread.h
      include/my_pthread.h
      include/my_sys.h
      include/myisam.h
      include/mysql.h
      include/mysql.h.pp
      include/mysql/plugin.h
      include/mysql/psi/mysql_thread.h
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v1.h.pp
      include/mysql_com.h
      include/mysql_embed.h
      include/sha1.h
      include/sql_common.h
      libmysql/CMakeLists.txt
      libmysql/Makefile.shared
      libmysql/client_settings.h
      libmysql/errmsg.c
      libmysql/libmysql.c
      libmysql/libmysql.def
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
      libmysqld/embedded_priv.h
      libmysqld/lib_sql.cc
      libmysqld/libmysqld.c
      libservices/HOWTO
      mysql-test/CMakeLists.txt
      mysql-test/collections/default.daily
      mysql-test/collections/default.experimental
      mysql-test/collections/default.weekly
      mysql-test/extra/rpl_tests/delayed_slave_wait_on_query.inc
      mysql-test/extra/rpl_tests/rpl_auto_increment.test
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/extra/rpl_tests/rpl_charset.test
      mysql-test/extra/rpl_tests/rpl_conflicts.test
      mysql-test/extra/rpl_tests/rpl_extraMaster_Col.test
      mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
      mysql-test/extra/rpl_tests/rpl_mixing_engines.inc
      mysql-test/extra/rpl_tests/rpl_mixing_engines.test
      mysql-test/extra/rpl_tests/rpl_row_sp003.test
      mysql-test/extra/rpl_tests/rpl_start_stop_slave.test
      mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test
      mysql-test/extra/rpl_tests/rpl_stop_middle_group.test
      mysql-test/include/commit.inc
      mysql-test/include/common-tests.inc
      mysql-test/include/concurrent.inc
      mysql-test/include/ctype_numconv.inc
      mysql-test/include/ctype_unicode_latin.inc
      mysql-test/include/deadlock.inc
      mysql-test/include/diff_tables.inc
      mysql-test/include/handler.inc
      mysql-test/include/have_partition.inc
      mysql-test/include/index_merge1.inc
      mysql-test/include/index_merge2.inc
      mysql-test/include/index_merge_2sweeps.inc
      mysql-test/include/index_merge_ror.inc
      mysql-test/include/index_merge_ror_cpk.inc
      mysql-test/include/loaddata_autocom.inc
      mysql-test/include/mix1.inc
      mysql-test/include/mix2.inc
      mysql-test/include/mtr_check.sql
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/mysqld--help.inc
      mysql-test/include/ps_modify.inc
      mysql-test/include/query_cache.inc
      mysql-test/include/read_many_rows.inc
      mysql-test/include/rowid_order.inc
      mysql-test/include/show_binlog_events2.inc
      mysql-test/include/show_binlog_using_logname.inc
      mysql-test/include/unsafe_binlog.inc
      mysql-test/include/wait_for_slave_io_error.inc
      mysql-test/include/wait_for_slave_param.inc
      mysql-test/include/wait_for_slave_sql_error.inc
      mysql-test/lib/mtr_cases.pm
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/1st.result
      mysql-test/r/alter_table.result
      mysql-test/r/archive.result
      mysql-test/r/archive_gis.result
      mysql-test/r/bootstrap.result
      mysql-test/r/cache_innodb.result
      mysql-test/r/change_user.result
      mysql-test/r/check.result
      mysql-test/r/commit_1innodb.result
      mysql-test/r/compress.result
      mysql-test/r/concurrent_innodb_safelog.result
      mysql-test/r/concurrent_innodb_unsafelog.result
      mysql-test/r/connect.result
      mysql-test/r/create.result
      mysql-test/r/csv.result
      mysql-test/r/ctype_binary.result
      mysql-test/r/ctype_cp1251.result
      mysql-test/r/ctype_errors.result
      mysql-test/r/ctype_latin1.result
      mysql-test/r/ctype_tis620.result
      mysql-test/r/ctype_uca.result
      mysql-test/r/ctype_ucs.result
      mysql-test/r/ctype_ujis.result
      mysql-test/r/ctype_utf16_uca.result
      mysql-test/r/ctype_utf32.result
      mysql-test/r/ctype_utf32_uca.result
      mysql-test/r/ctype_utf8.result
      mysql-test/r/ctype_utf8mb4.result
      mysql-test/r/ctype_utf8mb4_heap.result
      mysql-test/r/ctype_utf8mb4_innodb.result
      mysql-test/r/ctype_utf8mb4_myisam.result
      mysql-test/r/ctype_utf8mb4_ndb.result
      mysql-test/r/deadlock_innodb.result
      mysql-test/r/delayed.result
      mysql-test/r/delete.result
      mysql-test/r/derived.result
      mysql-test/r/distinct.result
      mysql-test/r/drop.result
      mysql-test/r/error_simulation.result
      mysql-test/r/errors.result
      mysql-test/r/events_bugs.result
      mysql-test/r/events_logs_tests.result
      mysql-test/r/explain.result
      mysql-test/r/flush.result
      mysql-test/r/func_analyse.result
      mysql-test/r/func_concat.result
      mysql-test/r/func_gconcat.result
      mysql-test/r/func_group.result
      mysql-test/r/func_group_innodb.result
      mysql-test/r/func_math.result
      mysql-test/r/func_misc.result
      mysql-test/r/func_str.result
      mysql-test/r/func_time.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/gis.result
      mysql-test/r/grant.result
      mysql-test/r/grant2.result
      mysql-test/r/grant3.result
      mysql-test/r/grant_cache_no_prot.result
      mysql-test/r/grant_cache_ps_prot.result
      mysql-test/r/greedy_optimizer.result
      mysql-test/r/group_by.result
      mysql-test/r/group_min_max.result
      mysql-test/r/handler_innodb.result
      mysql-test/r/handler_myisam.result
      mysql-test/r/having.result
      mysql-test/r/heap.result
      mysql-test/r/heap_hash.result
      mysql-test/r/index_merge_innodb.result
      mysql-test/r/index_merge_myisam.result
      mysql-test/r/information_schema.result
      mysql-test/r/ipv4_as_ipv6.result
      mysql-test/r/join.result
      mysql-test/r/join_nested.result
      mysql-test/r/join_outer.result
      mysql-test/r/join_outer_innodb.result
      mysql-test/r/key.result
      mysql-test/r/key_cache.result
      mysql-test/r/key_diff.result
      mysql-test/r/keywords.result
      mysql-test/r/loaddata_autocom_innodb.result
      mysql-test/r/lock_sync.result
      mysql-test/r/log_state.result
      mysql-test/r/log_tables.result
      mysql-test/r/log_tables_upgrade.result
      mysql-test/r/lowercase_fs_off.result
      mysql-test/r/lowercase_table.result
      mysql-test/r/mdl_sync.result
      mysql-test/r/merge.result
      mysql-test/r/merge_mmap.result
      mysql-test/r/mix2_myisam.result
      mysql-test/r/myisam-system.result
      mysql-test/r/myisam.result
      mysql-test/r/myisampack.result
      mysql-test/r/mysql.result
      mysql-test/r/mysql_upgrade.result
      mysql-test/r/mysql_upgrade_ssl.result
      mysql-test/r/mysqladmin.result
      mysql-test/r/mysqlbinlog.result
      mysql-test/r/mysqlbinlog_row.result
      mysql-test/r/mysqlbinlog_row_innodb.result
      mysql-test/r/mysqlbinlog_row_myisam.result
      mysql-test/r/mysqlbinlog_row_trans.result
      mysql-test/r/mysqlcheck.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result*
      mysql-test/r/mysqldump-max.result
      mysql-test/r/mysqldump.result
      mysql-test/r/mysqlshow.result
      mysql-test/r/named_pipe.result*
      mysql-test/r/negation_elimination.result
      mysql-test/r/not_partition.result
      mysql-test/r/partition.result
      mysql-test/r/partition_disabled.result
      mysql-test/r/partition_error.result
      mysql-test/r/partition_exchange.result
      mysql-test/r/partition_not_blackhole.result
      mysql-test/r/partition_pruning.result
      mysql-test/r/profiling.result
      mysql-test/r/ps.result
      mysql-test/r/ps_1general.result
      mysql-test/r/ps_2myisam.result
      mysql-test/r/ps_3innodb.result
      mysql-test/r/ps_4heap.result
      mysql-test/r/ps_5merge.result
      mysql-test/r/ps_ddl1.result
      mysql-test/r/query_cache_debug.result
      mysql-test/r/read_only.result
      mysql-test/r/rename.result
      mysql-test/r/row.result
      mysql-test/r/rowid_order_innodb.result
      mysql-test/r/select_safe.result
      mysql-test/r/shm.result*
      mysql-test/r/signal.result
      mysql-test/r/signal_demo2.result
      mysql-test/r/signal_demo3.result
      mysql-test/r/single_delete_update.result
      mysql-test/r/sp-bugs.result
      mysql-test/r/sp-destruct.result
      mysql-test/r/sp-dynamic.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-prelocking.result
      mysql-test/r/sp-security.result
      mysql-test/r/sp-vars.result
      mysql-test/r/sp.result
      mysql-test/r/sp_notembedded.result
      mysql-test/r/sp_trans.result
      mysql-test/r/ssl.result
      mysql-test/r/ssl_compress.result
      mysql-test/r/status.result
      mysql-test/r/subselect_debug.result
      mysql-test/r/subselect_innodb.result
      mysql-test/r/subselect_notembedded.result
      mysql-test/r/sum_distinct.result
      mysql-test/r/system_mysql_db.result
      mysql-test/r/temp_table.result
      mysql-test/r/timezone2.result
      mysql-test/r/trigger-trans.result
      mysql-test/r/trigger.result
      mysql-test/r/truncate_coverage.result
      mysql-test/r/type_blob.result
      mysql-test/r/type_date.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/union.result
      mysql-test/r/unsafe_binlog_innodb.result
      mysql-test/r/user_var.result
      mysql-test/r/variables.result
      mysql-test/r/variables_debug.result
      mysql-test/r/view.result
      mysql-test/r/warnings.result
      mysql-test/r/xa.result
      mysql-test/suite/binlog/r/binlog_base64_flag.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_incident.test
      mysql-test/suite/binlog/t/binlog_killed.test
      mysql-test/suite/binlog/t/binlog_row_binlog.test
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/federated/federated.result
      mysql-test/suite/federated/federated_server.result
      mysql-test/suite/funcs_1/r/innodb_storedproc_06.result
      mysql-test/suite/funcs_1/r/innodb_trig_0102.result
      mysql-test/suite/funcs_1/r/innodb_trig_03e.result
      mysql-test/suite/funcs_1/r/innodb_trig_08.result
      mysql-test/suite/funcs_1/r/innodb_views.result
      mysql-test/suite/funcs_1/r/is_columns_is.result
      mysql-test/suite/funcs_1/r/is_columns_mysql.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.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_statistics_mysql_embedded.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_table_constraints_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_tables_mysql.result
      mysql-test/suite/funcs_1/r/is_tables_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_user_privileges.result
      mysql-test/suite/funcs_1/r/memory_storedproc_06.result
      mysql-test/suite/funcs_1/r/memory_trig_0102.result
      mysql-test/suite/funcs_1/r/memory_trig_03e.result
      mysql-test/suite/funcs_1/r/memory_trig_08.result
      mysql-test/suite/funcs_1/r/memory_views.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_06.result
      mysql-test/suite/funcs_1/r/myisam_trig_0102.result
      mysql-test/suite/funcs_1/r/myisam_trig_03e.result
      mysql-test/suite/funcs_1/r/myisam_trig_08.result
      mysql-test/suite/funcs_1/r/myisam_views.result
      mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result
      mysql-test/suite/funcs_1/r/processlist_priv_ps.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/funcs_1/storedproc/storedproc_06.inc
      mysql-test/suite/funcs_1/t/is_user_privileges.test
      mysql-test/suite/innodb/r/innodb-autoinc.result
      mysql-test/suite/innodb/r/innodb-index.result
      mysql-test/suite/innodb/r/innodb-zip.result
      mysql-test/suite/innodb/r/innodb.result
      mysql-test/suite/innodb/r/innodb_bug34053.result
      mysql-test/suite/innodb/r/innodb_bug35220.result
      mysql-test/suite/innodb/r/innodb_bug36172.result
      mysql-test/suite/innodb/r/innodb_bug38231.result
      mysql-test/suite/innodb/r/innodb_bug39438.result
      mysql-test/suite/innodb/r/innodb_bug52745.result
      mysql-test/suite/innodb/r/innodb_bug53591.result
      mysql-test/suite/innodb/r/innodb_file_format.result
      mysql-test/suite/innodb/r/innodb_gis.result
      mysql-test/suite/innodb/r/innodb_monitor.result
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/r/innodb_trx_weight.result
      mysql-test/suite/innodb/t/innodb-autoinc.test
      mysql-test/suite/innodb/t/innodb.test
      mysql-test/suite/innodb/t/innodb_bug34053.test
      mysql-test/suite/innodb/t/innodb_bug35220.test
      mysql-test/suite/innodb/t/innodb_bug36172.test
      mysql-test/suite/innodb/t/innodb_bug38231.test
      mysql-test/suite/innodb/t/innodb_bug39438.test
      mysql-test/suite/innodb/t/innodb_gis.test
      mysql-test/suite/innodb/t/innodb_monitor.test
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb/t/innodb_trx_weight.test
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_condition_pushdown.result
      mysql-test/suite/ndb/r/ndb_gis.result
      mysql-test/suite/ndb/r/ndb_read_multi_range.result
      mysql-test/suite/ndb/t/ndb_read_multi_range.test
      mysql-test/suite/ndb_team/r/rpl_ndb_mix_innodb.result
      mysql-test/suite/parts/inc/partition.pre
      mysql-test/suite/parts/inc/partition_check.inc
      mysql-test/suite/parts/inc/partition_check_drop.inc
      mysql-test/suite/parts/inc/partition_crash.inc
      mysql-test/suite/parts/inc/partition_engine.inc
      mysql-test/suite/parts/inc/partition_fail.inc
      mysql-test/suite/parts/inc/partition_layout.inc
      mysql-test/suite/parts/inc/partition_layout_check1.inc
      mysql-test/suite/parts/inc/partition_layout_check2.inc
      mysql-test/suite/parts/inc/partition_syntax_2.inc
      mysql-test/suite/parts/inc/partition_value.inc
      mysql-test/suite/parts/r/part_ctype_utf32.result
      mysql-test/suite/parts/r/partition_alter1_1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
      mysql-test/suite/parts/r/partition_alter1_1_innodb.result
      mysql-test/suite/parts/r/partition_alter1_1_myisam.result
      mysql-test/suite/parts/r/partition_alter1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter1_2_myisam.result
      mysql-test/suite/parts/r/partition_alter2_1_1_innodb.result
      mysql-test/suite/parts/r/partition_alter2_1_2_innodb.result
      mysql-test/suite/parts/r/partition_alter2_1_myisam.result
      mysql-test/suite/parts/r/partition_alter2_2_1_innodb.result
      mysql-test/suite/parts/r/partition_alter2_2_2_innodb.result
      mysql-test/suite/parts/r/partition_alter2_2_myisam.result
      mysql-test/suite/parts/r/partition_alter3_innodb.result
      mysql-test/suite/parts/r/partition_alter3_myisam.result
      mysql-test/suite/parts/r/partition_alter4_innodb.result
      mysql-test/suite/parts/r/partition_alter4_myisam.result
      mysql-test/suite/parts/r/partition_basic_innodb.result
      mysql-test/suite/parts/r/partition_basic_myisam.result
      mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
      mysql-test/suite/parts/r/partition_debug_innodb.result
      mysql-test/suite/parts/r/partition_debug_myisam.result
      mysql-test/suite/parts/r/partition_engine_innodb.result
      mysql-test/suite/parts/r/partition_engine_myisam.result
      mysql-test/suite/parts/r/partition_special_innodb.result
      mysql-test/suite/parts/r/partition_special_myisam.result
      mysql-test/suite/parts/r/partition_syntax_innodb.result
      mysql-test/suite/parts/r/partition_syntax_myisam.result
      mysql-test/suite/parts/t/part_supported_sql_func_innodb.test
      mysql-test/suite/parts/t/partition_alter1_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter2_1_1_innodb.test
      mysql-test/suite/parts/t/partition_alter2_1_2_innodb.test
      mysql-test/suite/parts/t/partition_alter2_2_2_innodb.test
      mysql-test/suite/parts/t/partition_alter4_innodb.test
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
      mysql-test/suite/parts/t/partition_special_innodb.test
      mysql-test/suite/parts/t/partition_special_myisam.test
      mysql-test/suite/perfschema/include/binlog_common.inc
      mysql-test/suite/perfschema/include/cleanup_helper.inc
      mysql-test/suite/perfschema/include/privilege.inc
      mysql-test/suite/perfschema/include/setup_helper.inc
      mysql-test/suite/perfschema/include/start_server_common.inc
      mysql-test/suite/perfschema/include/table_io_cleanup_helper.inc
      mysql-test/suite/perfschema/include/table_io_result_helper.inc
      mysql-test/suite/perfschema/include/table_io_setup_helper.inc
      mysql-test/suite/perfschema/r/aggregate.result
      mysql-test/suite/perfschema/r/binlog_mix.result
      mysql-test/suite/perfschema/r/binlog_row.result
      mysql-test/suite/perfschema/r/binlog_stmt.result
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/r/column_privilege.result
      mysql-test/suite/perfschema/r/csv_table_io.result
      mysql-test/suite/perfschema/r/ddl_cond_instances.result
      mysql-test/suite/perfschema/r/ddl_events_waits_current.result
      mysql-test/suite/perfschema/r/ddl_events_waits_history.result
      mysql-test/suite/perfschema/r/ddl_events_waits_history_long.result
      mysql-test/suite/perfschema/r/ddl_ews_by_instance.result
      mysql-test/suite/perfschema/r/ddl_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_file_instances.result
      mysql-test/suite/perfschema/r/ddl_fs_by_event_name.result
      mysql-test/suite/perfschema/r/ddl_fs_by_instance.result
      mysql-test/suite/perfschema/r/ddl_mutex_instances.result
      mysql-test/suite/perfschema/r/ddl_performance_timers.result
      mysql-test/suite/perfschema/r/ddl_rwlock_instances.result
      mysql-test/suite/perfschema/r/ddl_setup_consumers.result
      mysql-test/suite/perfschema/r/ddl_setup_instruments.result
      mysql-test/suite/perfschema/r/ddl_setup_timers.result
      mysql-test/suite/perfschema/r/dml_cond_instances.result
      mysql-test/suite/perfschema/r/dml_events_waits_current.result
      mysql-test/suite/perfschema/r/dml_events_waits_history.result
      mysql-test/suite/perfschema/r/dml_events_waits_history_long.result
      mysql-test/suite/perfschema/r/dml_ews_by_instance.result
      mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
      mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_instances.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result
      mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result
      mysql-test/suite/perfschema/r/dml_mutex_instances.result
      mysql-test/suite/perfschema/r/dml_performance_timers.result
      mysql-test/suite/perfschema/r/dml_rwlock_instances.result
      mysql-test/suite/perfschema/r/dml_setup_consumers.result
      mysql-test/suite/perfschema/r/dml_setup_instruments.result
      mysql-test/suite/perfschema/r/dml_setup_timers.result
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/func_mutex.result
      mysql-test/suite/perfschema/r/global_read_lock.result
      mysql-test/suite/perfschema/r/indexed_table_io.result
      mysql-test/suite/perfschema/r/information_schema.result
      mysql-test/suite/perfschema/r/innodb_table_io.result
      mysql-test/suite/perfschema/r/memory_table_io.result
      mysql-test/suite/perfschema/r/merge_table_io.result
      mysql-test/suite/perfschema/r/misc.result
      mysql-test/suite/perfschema/r/multi_table_io.result
      mysql-test/suite/perfschema/r/myisam_file_io.result
      mysql-test/suite/perfschema/r/myisam_table_io.result
      mysql-test/suite/perfschema/r/no_threads.result
      mysql-test/suite/perfschema/r/one_thread_per_con.result
      mysql-test/suite/perfschema/r/part_table_io.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/privilege.result
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/query_cache.result
      mysql-test/suite/perfschema/r/read_only.result
      mysql-test/suite/perfschema/r/rollback_table_io.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/selects.result
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/r/short_option_1.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_table_hdl.result
      mysql-test/suite/perfschema/r/start_server_no_table_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
      mysql-test/suite/perfschema/r/temp_table_io.result
      mysql-test/suite/perfschema/r/trigger_table_io.result
      mysql-test/suite/perfschema/r/view_table_io.result
      mysql-test/suite/perfschema/t/aggregate.test
      mysql-test/suite/perfschema/t/checksum.test
      mysql-test/suite/perfschema/t/column_privilege.test
      mysql-test/suite/perfschema/t/csv_table_io.test
      mysql-test/suite/perfschema/t/ddl_cond_instances.test
      mysql-test/suite/perfschema/t/ddl_events_waits_current.test
      mysql-test/suite/perfschema/t/ddl_events_waits_history.test
      mysql-test/suite/perfschema/t/ddl_events_waits_history_long.test
      mysql-test/suite/perfschema/t/ddl_ews_by_instance.test
      mysql-test/suite/perfschema/t/ddl_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_file_instances.test
      mysql-test/suite/perfschema/t/ddl_fs_by_event_name.test
      mysql-test/suite/perfschema/t/ddl_fs_by_instance.test
      mysql-test/suite/perfschema/t/ddl_mutex_instances.test
      mysql-test/suite/perfschema/t/ddl_performance_timers.test
      mysql-test/suite/perfschema/t/ddl_rwlock_instances.test
      mysql-test/suite/perfschema/t/ddl_setup_consumers.test
      mysql-test/suite/perfschema/t/ddl_setup_instruments.test
      mysql-test/suite/perfschema/t/ddl_setup_timers.test
      mysql-test/suite/perfschema/t/dml_cond_instances.test
      mysql-test/suite/perfschema/t/dml_events_waits_current.test
      mysql-test/suite/perfschema/t/dml_events_waits_history.test
      mysql-test/suite/perfschema/t/dml_events_waits_history_long.test
      mysql-test/suite/perfschema/t/dml_ews_by_instance.test
      mysql-test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
      mysql-test/suite/perfschema/t/dml_ews_global_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_instances.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_event_name.test
      mysql-test/suite/perfschema/t/dml_file_summary_by_instance.test
      mysql-test/suite/perfschema/t/dml_mutex_instances.test
      mysql-test/suite/perfschema/t/dml_performance_timers.test
      mysql-test/suite/perfschema/t/dml_rwlock_instances.test
      mysql-test/suite/perfschema/t/dml_setup_consumers.test
      mysql-test/suite/perfschema/t/dml_setup_instruments.test
      mysql-test/suite/perfschema/t/dml_setup_timers.test
      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/indexed_table_io.test
      mysql-test/suite/perfschema/t/information_schema.test
      mysql-test/suite/perfschema/t/innodb_table_io.test
      mysql-test/suite/perfschema/t/memory_table_io.test
      mysql-test/suite/perfschema/t/merge_table_io.test
      mysql-test/suite/perfschema/t/misc.test
      mysql-test/suite/perfschema/t/multi_table_io.test
      mysql-test/suite/perfschema/t/myisam_file_io.test
      mysql-test/suite/perfschema/t/myisam_table_io.test
      mysql-test/suite/perfschema/t/no_threads-master.opt
      mysql-test/suite/perfschema/t/no_threads.test
      mysql-test/suite/perfschema/t/one_thread_per_con.test
      mysql-test/suite/perfschema/t/part_table_io.test
      mysql-test/suite/perfschema/t/privilege.test
      mysql-test/suite/perfschema/t/privilege_table_io.test
      mysql-test/suite/perfschema/t/query_cache.test
      mysql-test/suite/perfschema/t/read_only.test
      mysql-test/suite/perfschema/t/rollback_table_io.test
      mysql-test/suite/perfschema/t/selects.test
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/suite/perfschema/t/short_option_1-master.opt
      mysql-test/suite/perfschema/t/start_server_no_cond_class.test
      mysql-test/suite/perfschema/t/start_server_no_cond_inst.test
      mysql-test/suite/perfschema/t/start_server_no_file_class.test
      mysql-test/suite/perfschema/t/start_server_no_file_inst.test
      mysql-test/suite/perfschema/t/start_server_no_mutex_class.test
      mysql-test/suite/perfschema/t/start_server_no_mutex_inst.test
      mysql-test/suite/perfschema/t/start_server_no_rwlock_class.test
      mysql-test/suite/perfschema/t/start_server_no_rwlock_inst.test
      mysql-test/suite/perfschema/t/start_server_no_thread_class.test
      mysql-test/suite/perfschema/t/start_server_no_thread_inst.test
      mysql-test/suite/perfschema/t/start_server_nothing.test
      mysql-test/suite/perfschema/t/tampered_perfschema_table1.test
      mysql-test/suite/perfschema/t/temp_table_io.test
      mysql-test/suite/perfschema/t/thread_cache.test
      mysql-test/suite/perfschema/t/trigger_table_io.test
      mysql-test/suite/perfschema/t/view_table_io.test
      mysql-test/suite/rpl/r/rpl000013.result
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/r/rpl_charset.result
      mysql-test/suite/rpl/r/rpl_conditional_comments.result
      mysql-test/suite/rpl/r/rpl_delayed_slave.result
      mysql-test/suite/rpl/r/rpl_do_grant.result
      mysql-test/suite/rpl/r/rpl_drop.result
      mysql-test/suite/rpl/r/rpl_drop_temp.result
      mysql-test/suite/rpl/r/rpl_drop_view.result
      mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
      mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
      mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
      mysql-test/suite/rpl/r/rpl_flushlog_loop.result
      mysql-test/suite/rpl/r/rpl_heartbeat.result
      mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
      mysql-test/suite/rpl/r/rpl_ignore_table.result
      mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_multi_update3.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_packet.result
      mysql-test/suite/rpl/r/rpl_replicate_do.result
      mysql-test/suite/rpl/r/rpl_rotate_logs.result
      mysql-test/suite/rpl/r/rpl_row_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_row_colSize.result
      mysql-test/suite/rpl/r/rpl_row_conflicts.result
      mysql-test/suite/rpl/r/rpl_row_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_row_find_row.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_sp003.result
      mysql-test/suite/rpl/r/rpl_row_trig003.result
      mysql-test/suite/rpl/r/rpl_session_var.result
      mysql-test/suite/rpl/r/rpl_sp.result
      mysql-test/suite/rpl/r/rpl_stm_000001.result
      mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_no_op.result
      mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
      mysql-test/suite/rpl/r/rpl_stm_until.result
      mysql-test/suite/rpl/r/rpl_temp_table.result
      mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_binlog_corruption.test
      mysql-test/suite/rpl/t/rpl_bug38694.test
      mysql-test/suite/rpl/t/rpl_change_master.test
      mysql-test/suite/rpl/t/rpl_conditional_comments.test
      mysql-test/suite/rpl/t/rpl_delayed_slave.test
      mysql-test/suite/rpl/t/rpl_do_grant.test
      mysql-test/suite/rpl/t/rpl_drop.test
      mysql-test/suite/rpl/t/rpl_loadfile.test
      mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
      mysql-test/suite/rpl/t/rpl_nondeterministic_functions.test
      mysql-test/suite/rpl/t/rpl_packet.test
      mysql-test/suite/rpl/t/rpl_replicate_do.test
      mysql-test/suite/rpl/t/rpl_rotate_logs.test
      mysql-test/suite/rpl/t/rpl_row_find_row.test
      mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
      mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
      mysql-test/suite/rpl/t/rpl_row_utf16.test
      mysql-test/suite/rpl/t/rpl_server_id1.test
      mysql-test/suite/rpl/t/rpl_slow_query_log-slave.opt
      mysql-test/suite/rpl/t/rpl_stm_auto_increment_bug33029.test
      mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
      mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
      mysql-test/suite/rpl/t/rpl_temporary_errors.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result
      mysql-test/suite/rpl_ndb/r/rpl_ndb_stm_innodb.result
      mysql-test/suite/rpl_ndb/t/disabled.def
      mysql-test/suite/sys_vars/inc/query_alloc_block_size_basic.inc
      mysql-test/suite/sys_vars/r/all_vars.result
      mysql-test/suite/sys_vars/r/foreign_key_checks_func.result
      mysql-test/suite/sys_vars/r/innodb_file_format_basic.result
      mysql-test/suite/sys_vars/r/max_binlog_cache_size_basic.result
      mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result
      mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_32.result
      mysql-test/suite/sys_vars/r/query_alloc_block_size_basic_64.result
      mysql-test/suite/sys_vars/r/slow_query_log_func.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      mysql-test/suite/sys_vars/r/sql_notes_func.result
      mysql-test/suite/sys_vars/r/storage_engine_basic.result
      mysql-test/suite/sys_vars/t/all_vars.test
      mysql-test/suite/sys_vars/t/foreign_key_checks_func.test
      mysql-test/suite/sys_vars/t/general_log_file_basic-master.opt
      mysql-test/suite/sys_vars/t/general_log_file_func-master.opt
      mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test
      mysql-test/suite/sys_vars/t/rpl_max_binlog_size_func-master.opt
      mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
      mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
      mysql-test/suite/sys_vars/t/sql_big_selects_func.test
      mysql-test/suite/sys_vars/t/storage_engine_basic.test
      mysql-test/t/archive.test
      mysql-test/t/archive_gis.test
      mysql-test/t/cache_innodb.test
      mysql-test/t/change_user.test
      mysql-test/t/check.test
      mysql-test/t/create.test
      mysql-test/t/ctype_uca.test
      mysql-test/t/ctype_utf16_uca.test
      mysql-test/t/ctype_utf32.test
      mysql-test/t/ctype_utf32_uca.test
      mysql-test/t/ctype_utf8.test
      mysql-test/t/delayed.test
      mysql-test/t/delete.test
      mysql-test/t/disabled.def
      mysql-test/t/drop.test
      mysql-test/t/errors.test
      mysql-test/t/events_logs_tests-master.opt
      mysql-test/t/events_logs_tests.test
      mysql-test/t/explain.test
      mysql-test/t/flush.test
      mysql-test/t/func_analyse.test
      mysql-test/t/func_gconcat.test
      mysql-test/t/func_group.test
      mysql-test/t/func_math.test
      mysql-test/t/func_misc.test
      mysql-test/t/func_time.test
      mysql-test/t/gis.test
      mysql-test/t/grant.test
      mysql-test/t/grant2.test
      mysql-test/t/grant3.test
      mysql-test/t/group_by.test
      mysql-test/t/having.test
      mysql-test/t/heap.test
      mysql-test/t/heap_hash.test
      mysql-test/t/information_schema.test
      mysql-test/t/join.test
      mysql-test/t/join_outer.test
      mysql-test/t/key.test
      mysql-test/t/keywords.test
      mysql-test/t/kill.test
      mysql-test/t/lock_sync.test
      mysql-test/t/log_state-master.opt
      mysql-test/t/log_state.test
      mysql-test/t/log_state_bug33693-master.opt
      mysql-test/t/log_tables-big-master.opt
      mysql-test/t/log_tables-master.opt
      mysql-test/t/log_tables.test
      mysql-test/t/lowercase_fs_off.test
      mysql-test/t/lowercase_table.test
      mysql-test/t/mdl_sync.test
      mysql-test/t/merge.test
      mysql-test/t/merge_mmap.test
      mysql-test/t/multi_statement-master.opt
      mysql-test/t/myisam.test
      mysql-test/t/mysql.test
      mysql-test/t/mysql_client_test-master.opt
      mysql-test/t/mysqladmin.test
      mysql-test/t/mysqlbinlog.test
      mysql-test/t/mysqlcheck.test
      mysql-test/t/mysqldump-max.test
      mysql-test/t/mysqldump.test
      mysql-test/t/mysqlshow.test
      mysql-test/t/no-threads-master.opt
      mysql-test/t/partition.test
      mysql-test/t/partition_binlog_stmt.test
      mysql-test/t/partition_debug_sync.test
      mysql-test/t/partition_error.test
      mysql-test/t/partition_exchange.test
      mysql-test/t/ps-master.opt
      mysql-test/t/ps.test
      mysql-test/t/query_cache_debug.test
      mysql-test/t/show_check-master.opt
      mysql-test/t/single_delete_update.test
      mysql-test/t/sp-bugs.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp_trans.test
      mysql-test/t/subselect_debug.test
      mysql-test/t/subselect_innodb.test
      mysql-test/t/subselect_notembedded.test
      mysql-test/t/sum_distinct.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/timezone2.test
      mysql-test/t/trigger-trans.test
      mysql-test/t/type_blob.test
      mysql-test/t/type_datetime.test
      mysql-test/t/union-master.opt
      mysql-test/t/user_var.test
      mysql-test/t/variables.test
      mysql-test/t/variables_debug.test
      mysql-test/t/view.test
      mysql-test/t/xa.test
      mysys/charset-def.c
      mysys/default.c
      mysys/mf_iocache2.c
      mysys/my_gethostbyname.c
      mysys/my_gethwaddr.c
      mysys/my_getopt.c
      mysys/my_open.c
      mysys/my_sync.c
      mysys/my_wincond.c
      mysys/my_winfile.c
      mysys/my_winthread.c
      mysys/sha1.c
      mysys/stacktrace.c
      mysys/thr_mutex.c
      mysys/thr_rwlock.c
      regex/CMakeLists.txt
      regex/main.c
      scripts/CMakeLists.txt
      scripts/mysql_system_tables.sql
      scripts/mysql_system_tables_data.sql
      scripts/mysql_system_tables_fix.sql
      sql-common/Makefile.am
      sql-common/client.c
      sql/CMakeLists.txt
      sql/Makefile.am
      sql/authors.h
      sql/binlog.cc
      sql/binlog.h
      sql/client_settings.h
      sql/datadict.cc
      sql/event_scheduler.cc
      sql/events.cc
      sql/events.h
      sql/field.cc
      sql/field.h
      sql/filesort.cc
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      sql/ha_ndbcluster_binlog.cc
      sql/ha_ndbcluster_cond.cc
      sql/ha_ndbcluster_cond.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/item.cc
      sql/item.h
      sql/item_buff.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
      sql/item_create.cc
      sql/item_func.cc
      sql/item_func.h
      sql/item_geofunc.cc
      sql/item_geofunc.h
      sql/item_row.cc
      sql/item_row.h
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/key.cc
      sql/lex.h
      sql/lock.cc
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event.h
      sql/log_event_old.cc
      sql/log_event_old.h
      sql/mdl.cc
      sql/mdl.h
      sql/my_decimal.h
      sql/mysqld.cc
      sql/mysqld.h
      sql/opt_range.cc
      sql/opt_range.h
      sql/opt_sum.cc
      sql/partition_info.cc
      sql/partition_info.h
      sql/password.c
      sql/protocol.cc
      sql/protocol.h
      sql/records.cc
      sql/records.h
      sql/rpl_filter.cc
      sql/rpl_filter.h
      sql/rpl_handler.cc
      sql/rpl_injector.cc
      sql/rpl_injector.h
      sql/rpl_master.cc
      sql/rpl_mi.cc
      sql/rpl_mi.h
      sql/rpl_record.cc
      sql/rpl_record.h
      sql/rpl_reporting.cc
      sql/rpl_reporting.h
      sql/rpl_rli.cc
      sql/rpl_rli.h
      sql/rpl_slave.cc
      sql/rpl_slave.h
      sql/rpl_utility.cc
      sql/scheduler.h
      sql/set_var.cc
      sql/set_var.h
      sql/share/errmsg-utf8.txt
      sql/sp.cc
      sql/sp.h
      sql/sp_head.cc
      sql/sp_head.h
      sql/spatial.cc
      sql/spatial.h
      sql/sql_acl.cc
      sql/sql_acl.h
      sql/sql_admin.cc
      sql/sql_admin.h
      sql/sql_alter.cc
      sql/sql_alter.h
      sql/sql_array.h
      sql/sql_audit.h
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_binlog.cc
      sql/sql_bitmap.h
      sql/sql_builtin.cc.in
      sql/sql_cache.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_connect.h
      sql/sql_const.h
      sql/sql_cursor.cc
      sql/sql_db.cc
      sql/sql_delete.cc
      sql/sql_delete.h
      sql/sql_derived.cc
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_help.cc
      sql/sql_insert.cc
      sql/sql_insert.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_parse.h
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_partition_admin.cc
      sql/sql_partition_admin.h
      sql/sql_plugin.cc
      sql/sql_plugin.h
      sql/sql_prepare.cc
      sql/sql_priv.h
      sql/sql_reload.cc
      sql/sql_rename.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_show.h
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_string.h
      sql/sql_table.cc
      sql/sql_test.cc
      sql/sql_test.h
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_truncate.cc
      sql/sql_truncate.h
      sql/sql_union.cc
      sql/sql_update.cc
      sql/sql_update.h
      sql/sql_view.cc
      sql/sql_yacc.yy
      sql/structs.h
      sql/sys_vars.cc
      sql/sys_vars.h
      sql/table.cc
      sql/table.h
      sql/transaction.cc
      sql/tztime.cc
      storage/archive/ha_archive.cc
      storage/archive/ha_archive.h
      storage/blackhole/ha_blackhole.cc
      storage/blackhole/ha_blackhole.h
      storage/example/ha_example.cc
      storage/example/ha_example.h
      storage/federated/ha_federated.cc
      storage/federated/ha_federated.h
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/heap/hp_rkey.c
      storage/innobase/CMakeLists.txt
      storage/innobase/Doxyfile
      storage/innobase/Makefile.am
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/btr/btr0sea.c
      storage/innobase/buf/buf0buddy.c
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0flu.c
      storage/innobase/buf/buf0lru.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/compile-innodb
      storage/innobase/dict/dict0boot.c
      storage/innobase/dict/dict0crea.c
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/eval/eval0eval.c
      storage/innobase/fil/fil0fil.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/buf0buddy.h
      storage/innobase/include/buf0buddy.ic
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0flu.h
      storage/innobase/include/buf0types.h
      storage/innobase/include/data0type.h
      storage/innobase/include/data0type.ic
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/dict0types.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/ha_prototypes.h
      storage/innobase/include/ibuf0ibuf.h
      storage/innobase/include/lock0lock.h
      storage/innobase/include/os0sync.h
      storage/innobase/include/pars0sym.h
      storage/innobase/include/que0que.h
      storage/innobase/include/rem0rec.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/row0row.h
      storage/innobase/include/row0upd.h
      storage/innobase/include/srv0mon.h
      storage/innobase/include/srv0srv.h
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0trx.h
      storage/innobase/include/trx0undo.h
      storage/innobase/include/univ.i
      storage/innobase/include/ut0rbt.h
      storage/innobase/include/ut0rnd.ic
      storage/innobase/include/ut0ut.h
      storage/innobase/lock/lock0lock.c
      storage/innobase/log/log0log.c
      storage/innobase/log/log0recv.c
      storage/innobase/os/os0file.c
      storage/innobase/os/os0sync.c
      storage/innobase/pars/pars0pars.c
      storage/innobase/pars/pars0sym.c
      storage/innobase/plug.in
      storage/innobase/que/que0que.c
      storage/innobase/rem/rem0rec.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/row0uins.c
      storage/innobase/row/row0umod.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/sync0sync.c
      storage/innobase/trx/trx0i_s.c
      storage/innobase/trx/trx0purge.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/ut/ut0ut.c
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_dynrec.c
      storage/myisam/mi_extra.c
      storage/myisam/mi_key.c
      storage/myisam/mi_packrec.c
      storage/myisam/mi_rkey.c
      storage/myisam/mi_rnext.c
      storage/myisam/mi_rnext_same.c
      storage/myisam/mi_rprev.c
      storage/myisam/mi_scan.c
      storage/myisam/myisamchk.c
      storage/myisam/myisamdef.h
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/ndb/plug.in
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/perfschema/CMakeLists.txt
      storage/perfschema/Makefile.am
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/ha_perfschema.h
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/pfs_engine_table.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/pfs_instr.h
      storage/perfschema/pfs_lock.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/pfs_server.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      storage/perfschema/table_events_waits_summary.cc
      storage/perfschema/table_events_waits_summary.h
      storage/perfschema/table_ews_global_by_event_name.cc
      storage/perfschema/table_file_instances.cc
      storage/perfschema/table_file_instances.h
      storage/perfschema/table_file_summary.cc
      storage/perfschema/table_file_summary.h
      storage/perfschema/table_performance_timers.cc
      storage/perfschema/table_setup_consumers.cc
      storage/perfschema/table_setup_instruments.cc
      storage/perfschema/table_setup_timers.cc
      storage/perfschema/table_sync_instances.cc
      storage/perfschema/table_sync_instances.h
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/stub_pfs_global.h
      strings/ctype-latin1.c
      strings/ctype-uca.c
      strings/ctype-ucs2.c
      strings/ctype-utf8.c
      strings/my_vsnprintf.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/examples/skip-t.c
      unittest/examples/skip_all-t.c
      unittest/examples/todo-t.c
      unittest/gunit/CMakeLists.txt
      unittest/mysys/CMakeLists.txt
      unittest/mytap/t/basic-t.c
      unittest/mytap/tap.c
      unittest/mytap/tap.h
      win/README
      storage/ndb/ndb_configure.m4
      mysql-test/r/func_in_all.result
      mysql-test/r/null_key_all.result
      mysql-test/r/order_by_all.result
      mysql-test/r/range_all.result
      mysql-test/r/select_all.result
      mysql-test/r/subquery_all.result
      mysql-test/include/null_key.inc
      mysql-test/include/order_by.inc
      mysql-test/include/range.inc
      mysql-test/include/select.inc
      mysql-test/include/subquery.inc
 2983 Bjorn Munch	2010-11-10 [merge]
      upmerge 57276

    modified:
      client/mysqltest.cc
      mysql-test/r/mysqltest.result
      mysql-test/t/mysqltest.test

Diff too large for email (476443 lines, the limit is 10000).
No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-mtr branch (bjorn.munch:2983 to 2985) Bjorn Munch14 Nov