From: Bjorn Munch Date: August 22 2011 1:27pm Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3103 to 3105) List-Archive: http://lists.mysql.com/commits/140772 Message-Id: <201108221327.p7MDRfPM024663@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3105 Bjorn Munch 2011-08-22 [merge] upmerge 11759877,12793170 added: mysql-test/suite/sys_vars/t/plugin_dir_basic-master.opt modified: client/mysqltest.cc mysql-test/include/mtr_check.sql mysql-test/include/mysqld--help.inc mysql-test/mysql-test-run.pl mysql-test/r/execution_constants.result mysql-test/r/mysqltest.result mysql-test/suite/sys_vars/r/plugin_dir_basic.result mysql-test/suite/sys_vars/t/plugin_dir_basic.test mysql-test/t/execution_constants.test mysql-test/t/mysqltest.test 3104 Bjorn Munch 2011-08-22 [merge] merge from trunk removed: mysql-test/include/have_join_cache_level.inc 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_jcl5.result mysql-test/r/join_cache_jcl8.result mysql-test/suite/sys_vars/r/optimizer_join_cache_level_basic.result mysql-test/suite/sys_vars/t/optimizer_join_cache_level_basic.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_jcl5.test mysql-test/t/join_cache_jcl8.test added: include/mysql/get_password.h include/mysql/psi/mysql_idle.h include/mysql/psi/mysql_socket.h mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test mysql-test/extra/rpl_tests/rpl_parallel_benchmark_load.test mysql-test/extra/rpl_tests/rpl_parallel_load.test mysql-test/extra/rpl_tests/rpl_parallel_load_innodb.test mysql-test/include/check_ipv4_mapped.inc mysql-test/include/have_openssl.inc mysql-test/include/not_mts_slave_parallel_workers.inc mysql-test/r/audit_plugin.result mysql-test/r/join_cache_bka_nobnl.result mysql-test/r/join_nested_bka_nobnl.result mysql-test/r/join_outer_bka_nobnl.result mysql-test/r/openssl.require mysql-test/r/rewrite_general_log.result mysql-test/r/rewrite_slow_log.result mysql-test/r/select_all_bka_nobnl.result mysql-test/r/select_icp_mrr_bka_nobnl.result mysql-test/r/select_none_bka_nobnl.result mysql-test/r/ssl-crl-revoked-crl.result mysql-test/r/ssl_crl.result mysql-test/r/ssl_crl_clients-valid.result mysql-test/r/ssl_crl_clients.result mysql-test/r/ssl_crl_clients_valid.result mysql-test/r/ssl_crl_clrpath.result mysql-test/r/subquery_all_bka_nobnl.result mysql-test/r/subquery_nomat_nosj_bka_nobnl.result mysql-test/r/subquery_none_bka_nobnl.result mysql-test/r/subquery_sj_all_bka_nobnl.result mysql-test/r/subquery_sj_dupsweed_bka_nobnl.result mysql-test/r/subquery_sj_firstmatch_bka_nobnl.result mysql-test/r/subquery_sj_innodb_all_bka_nobnl.result mysql-test/r/subquery_sj_innodb_none_bka_nobnl.result mysql-test/r/subquery_sj_loosescan_bka_nobnl.result mysql-test/r/subquery_sj_mat_bka_nobnl.result mysql-test/r/subquery_sj_none_bka_nobnl.result mysql-test/std_data/crl-ca-cert.pem mysql-test/std_data/crl-client-cert.pem mysql-test/std_data/crl-client-key.pem mysql-test/std_data/crl-client-revoked.crl mysql-test/std_data/crl-server-cert.pem mysql-test/std_data/crl-server-key.pem mysql-test/std_data/crldir/ mysql-test/std_data/crldir/fc725416.r0 mysql-test/suite/binlog/r/binlog_rewrite.result mysql-test/suite/binlog/t/binlog_rewrite.test mysql-test/suite/innodb/r/innodb-2byte-collation.result mysql-test/suite/innodb/r/innodb_ctype_ldml.result mysql-test/suite/innodb/t/innodb-2byte-collation-master.opt mysql-test/suite/innodb/t/innodb-2byte-collation.test mysql-test/suite/innodb/t/innodb_ctype_ldml-master.opt mysql-test/suite/innodb/t/innodb_ctype_ldml.test mysql-test/suite/perfschema/include/socket_check1.inc mysql-test/suite/perfschema/include/socket_event.inc mysql-test/suite/perfschema/include/socket_event_dbg.inc mysql-test/suite/perfschema/include/socket_ipv6.inc mysql-test/suite/perfschema/include/socket_summary_check.inc mysql-test/suite/perfschema/include/socket_summary_check_dbg.inc mysql-test/suite/perfschema/include/wait_till_sleep.inc mysql-test/suite/perfschema/r/ddl_socket_instances.result mysql-test/suite/perfschema/r/ddl_socket_summary_by_event_name.result mysql-test/suite/perfschema/r/ddl_socket_summary_by_instance.result mysql-test/suite/perfschema/r/dml_handler.result mysql-test/suite/perfschema/r/dml_socket_instances.result mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result mysql-test/suite/perfschema/r/socket_connect.result mysql-test/suite/perfschema/r/socket_instances_func.result mysql-test/suite/perfschema/r/socket_instances_func_win.result mysql-test/suite/perfschema/r/socket_summary_by_event_name_func.result mysql-test/suite/perfschema/r/socket_summary_by_instance_func.result mysql-test/suite/perfschema/r/socket_summary_by_instance_func_win.result mysql-test/suite/perfschema/r/start_server_no_socket_class.result mysql-test/suite/perfschema/r/start_server_no_socket_inst.result mysql-test/suite/perfschema/t/ddl_socket_instances.test mysql-test/suite/perfschema/t/ddl_socket_summary_by_event_name.test mysql-test/suite/perfschema/t/ddl_socket_summary_by_instance.test mysql-test/suite/perfschema/t/dml_handler.test mysql-test/suite/perfschema/t/dml_socket_instances.test mysql-test/suite/perfschema/t/dml_socket_summary_by_event_name.test mysql-test/suite/perfschema/t/dml_socket_summary_by_instance.test mysql-test/suite/perfschema/t/socket_connect.test mysql-test/suite/perfschema/t/socket_instances_func-master.opt mysql-test/suite/perfschema/t/socket_instances_func.test mysql-test/suite/perfschema/t/socket_instances_func_win-master.opt mysql-test/suite/perfschema/t/socket_instances_func_win.test mysql-test/suite/perfschema/t/socket_summary_by_event_name_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func.test mysql-test/suite/perfschema/t/socket_summary_by_instance_func_win.test mysql-test/suite/perfschema/t/start_server_no_socket_class-master.opt mysql-test/suite/perfschema/t/start_server_no_socket_class.test mysql-test/suite/perfschema/t/start_server_no_socket_inst-master.opt mysql-test/suite/perfschema/t/start_server_no_socket_inst.test mysql-test/suite/rpl/r/rpl_mixed_crash_safe.result.THIS mysql-test/suite/rpl/r/rpl_mixed_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_mixed_mts_rec_crash_safe_checksum.result mysql-test/suite/rpl/r/rpl_mts_check_concurrency.result mysql-test/suite/rpl/r/rpl_parallel.result mysql-test/suite/rpl/r/rpl_parallel_benchmark.result mysql-test/suite/rpl/r/rpl_parallel_conf_limits.result mysql-test/suite/rpl/r/rpl_parallel_conflicts.result mysql-test/suite/rpl/r/rpl_parallel_ddl.result mysql-test/suite/rpl/r/rpl_parallel_fallback.result mysql-test/suite/rpl/r/rpl_parallel_innodb.result mysql-test/suite/rpl/r/rpl_parallel_multi_db.result mysql-test/suite/rpl/r/rpl_parallel_seconds_behind_master.result mysql-test/suite/rpl/r/rpl_parallel_start_stop.result mysql-test/suite/rpl/r/rpl_parallel_switch_sequential.result mysql-test/suite/rpl/r/rpl_parallel_temp_query.result mysql-test/suite/rpl/r/rpl_row_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_row_mts_rec_crash_safe.result mysql-test/suite/rpl/r/rpl_sequential.result mysql-test/suite/rpl/r/rpl_stm_mts_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mts_rec_crash_safe.result mysql-test/suite/rpl/t/rpl_mixed_crash_safe-slave.opt.THIS mysql-test/suite/rpl/t/rpl_mixed_crash_safe.test.THIS mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-master.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum-slave.opt mysql-test/suite/rpl/t/rpl_mixed_mts_rec_crash_safe_checksum.test mysql-test/suite/rpl/t/rpl_mts_check_concurrency-slave.opt mysql-test/suite/rpl/t/rpl_mts_check_concurrency.test mysql-test/suite/rpl/t/rpl_parallel-master.opt mysql-test/suite/rpl/t/rpl_parallel-slave.opt mysql-test/suite/rpl/t/rpl_parallel.test mysql-test/suite/rpl/t/rpl_parallel_benchmark-master.opt mysql-test/suite/rpl/t/rpl_parallel_benchmark-slave.opt mysql-test/suite/rpl/t/rpl_parallel_benchmark.test mysql-test/suite/rpl/t/rpl_parallel_conf_limits-slave.opt mysql-test/suite/rpl/t/rpl_parallel_conf_limits.test mysql-test/suite/rpl/t/rpl_parallel_conflicts-slave.opt mysql-test/suite/rpl/t/rpl_parallel_conflicts.test mysql-test/suite/rpl/t/rpl_parallel_ddl-slave.opt mysql-test/suite/rpl/t/rpl_parallel_ddl.test mysql-test/suite/rpl/t/rpl_parallel_innodb-master.opt mysql-test/suite/rpl/t/rpl_parallel_innodb-slave.opt mysql-test/suite/rpl/t/rpl_parallel_innodb.test mysql-test/suite/rpl/t/rpl_parallel_multi_db-master.opt mysql-test/suite/rpl/t/rpl_parallel_multi_db-slave.opt mysql-test/suite/rpl/t/rpl_parallel_multi_db.test mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master-slave.opt mysql-test/suite/rpl/t/rpl_parallel_seconds_behind_master.test mysql-test/suite/rpl/t/rpl_parallel_start_stop-slave.opt mysql-test/suite/rpl/t/rpl_parallel_start_stop.test mysql-test/suite/rpl/t/rpl_parallel_switch_sequential-slave.opt mysql-test/suite/rpl/t/rpl_parallel_switch_sequential.test mysql-test/suite/rpl/t/rpl_parallel_temp_query-slave.opt mysql-test/suite/rpl/t/rpl_parallel_temp_query.test mysql-test/suite/rpl/t/rpl_row_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_row_mts_rec_crash_safe.test mysql-test/suite/rpl/t/rpl_sequential-master.opt mysql-test/suite/rpl/t/rpl_sequential-slave.opt mysql-test/suite/rpl/t/rpl_sequential.test mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_mts_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe-slave.opt mysql-test/suite/rpl/t/rpl_stm_mts_rec_crash_safe.test mysql-test/suite/sys_vars/r/innodb_adaptive_max_sleep_delay_basic.result mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result mysql-test/suite/sys_vars/r/pfs_max_socket_classes_basic.result mysql-test/suite/sys_vars/r/pfs_max_socket_instances_basic.result mysql-test/suite/sys_vars/r/slave_checkpoint_group_basic.result mysql-test/suite/sys_vars/r/slave_checkpoint_period_basic.result mysql-test/suite/sys_vars/r/slave_parallel_workers_basic.result mysql-test/suite/sys_vars/r/slave_pending_jobs_size_max_basic.result mysql-test/suite/sys_vars/t/innodb_adaptive_max_sleep_delay_basic.test mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_socket_classes_basic.test mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic-master.opt mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic.test mysql-test/suite/sys_vars/t/slave_checkpoint_group_basic.test mysql-test/suite/sys_vars/t/slave_checkpoint_period_basic.test mysql-test/suite/sys_vars/t/slave_parallel_workers_basic.test mysql-test/suite/sys_vars/t/slave_pending_jobs_size_max_basic.test mysql-test/t/audit_plugin-master.opt mysql-test/t/audit_plugin.test mysql-test/t/join_cache_bka_nobnl.test mysql-test/t/join_nested_bka_nobnl.test mysql-test/t/join_outer_bka_nobnl.test mysql-test/t/rewrite_general_log.test mysql-test/t/rewrite_slow_log.test mysql-test/t/select_all_bka_nobnl.test mysql-test/t/select_icp_mrr_bka_nobnl.test mysql-test/t/select_none_bka_nobnl.test mysql-test/t/ssl_crl-master.opt mysql-test/t/ssl_crl.test mysql-test/t/ssl_crl_clients-master.opt mysql-test/t/ssl_crl_clients.test mysql-test/t/ssl_crl_clients_valid-master.opt mysql-test/t/ssl_crl_clients_valid.test mysql-test/t/ssl_crl_clrpath-master.opt mysql-test/t/ssl_crl_clrpath.test mysql-test/t/subquery_all_bka_nobnl.test mysql-test/t/subquery_nomat_nosj_bka_nobnl.test mysql-test/t/subquery_none_bka_nobnl.test mysql-test/t/subquery_sj_all_bka_nobnl.test mysql-test/t/subquery_sj_dupsweed_bka_nobnl.test mysql-test/t/subquery_sj_firstmatch_bka_nobnl.test mysql-test/t/subquery_sj_innodb_all_bka_nobnl.test mysql-test/t/subquery_sj_innodb_none_bka_nobnl.test mysql-test/t/subquery_sj_loosescan_bka_nobnl.test mysql-test/t/subquery_sj_mat_bka_nobnl.test mysql-test/t/subquery_sj_none_bka_nobnl.test sql/dynamic_ids.cc sql/rpl_info_dummy.cc sql/rpl_info_dummy.h sql/rpl_rli_pdb.cc sql/rpl_rli_pdb.h sql/sql_rewrite.cc sql/sql_rewrite.h storage/innobase/buf/buf0checksum.c storage/innobase/include/buf0checksum.h storage/innobase/include/ut0crc32.h storage/innobase/ut/ut0crc32.c storage/perfschema/table_socket_instances.cc storage/perfschema/table_socket_instances.h storage/perfschema/table_socket_summary_by_event_name.cc storage/perfschema/table_socket_summary_by_event_name.h storage/perfschema/table_socket_summary_by_instance.cc storage/perfschema/table_socket_summary_by_instance.h renamed: mysql-test/r/join_cache_jcl0.result => mysql-test/r/join_cache_nojb.result mysql-test/r/join_cache_jcl4.result => mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_jcl6.result => mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_jcl7.result => mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_nested_jcl6.result => mysql-test/r/join_nested_bka.result mysql-test/r/join_outer_jcl6.result => mysql-test/r/join_outer_bka.result mysql-test/r/select_all_jcl6.result => mysql-test/r/select_all_bka.result mysql-test/r/select_icp_mrr_jcl6.result => mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_none_jcl6.result => mysql-test/r/select_none_bka.result mysql-test/r/subquery_all_jcl6.result => mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_nomat_nosj_jcl6.result => mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_none_jcl6.result => mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_sj_all_jcl6.result => mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_jcl7.result => mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed_jcl6.result => mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_jcl7.result => mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch_jcl6.result => mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_jcl7.result => mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_innodb_all_jcl6.result => mysql-test/r/subquery_sj_innodb_all_bka.result mysql-test/r/subquery_sj_innodb_all_jcl7.result => mysql-test/r/subquery_sj_innodb_all_bkaunique.result mysql-test/r/subquery_sj_innodb_none_jcl6.result => mysql-test/r/subquery_sj_innodb_none_bka.result mysql-test/r/subquery_sj_innodb_none_jcl7.result => mysql-test/r/subquery_sj_innodb_none_bkaunique.result mysql-test/r/subquery_sj_loosescan_jcl6.result => mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_jcl7.result => mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat_jcl6.result => mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_jcl7.result => mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_none_jcl6.result => mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_jcl7.result => mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/t/join_cache_jcl0.test => mysql-test/t/join_cache_nojb.test mysql-test/t/join_cache_jcl4.test => mysql-test/t/join_cache_bnl.test mysql-test/t/join_cache_jcl6.test => mysql-test/t/join_cache_bka.test mysql-test/t/join_cache_jcl7.test => mysql-test/t/join_cache_bkaunique.test mysql-test/t/join_nested_jcl6.test => mysql-test/t/join_nested_bka.test mysql-test/t/join_outer_jcl6.test => mysql-test/t/join_outer_bka.test mysql-test/t/select_all_jcl6.test => mysql-test/t/select_all_bka.test mysql-test/t/select_icp_mrr_jcl6.test => mysql-test/t/select_icp_mrr_bka.test mysql-test/t/select_none_jcl6.test => mysql-test/t/select_none_bka.test mysql-test/t/subquery_all_jcl6.test => mysql-test/t/subquery_all_bka.test mysql-test/t/subquery_nomat_nosj_jcl6.test => mysql-test/t/subquery_nomat_nosj_bka.test mysql-test/t/subquery_none_jcl6.test => mysql-test/t/subquery_none_bka.test mysql-test/t/subquery_sj_all_jcl6.test => mysql-test/t/subquery_sj_all_bka.test mysql-test/t/subquery_sj_all_jcl7.test => mysql-test/t/subquery_sj_all_bkaunique.test mysql-test/t/subquery_sj_dupsweed_jcl6.test => mysql-test/t/subquery_sj_dupsweed_bka.test mysql-test/t/subquery_sj_dupsweed_jcl7.test => mysql-test/t/subquery_sj_dupsweed_bkaunique.test mysql-test/t/subquery_sj_firstmatch_jcl6.test => mysql-test/t/subquery_sj_firstmatch_bka.test mysql-test/t/subquery_sj_firstmatch_jcl7.test => mysql-test/t/subquery_sj_firstmatch_bkaunique.test mysql-test/t/subquery_sj_innodb_all_jcl6.test => mysql-test/t/subquery_sj_innodb_all_bka.test mysql-test/t/subquery_sj_innodb_all_jcl7.test => mysql-test/t/subquery_sj_innodb_all_bkaunique.test mysql-test/t/subquery_sj_innodb_none_jcl6.test => mysql-test/t/subquery_sj_innodb_none_bka.test mysql-test/t/subquery_sj_innodb_none_jcl7.test => mysql-test/t/subquery_sj_innodb_none_bkaunique.test mysql-test/t/subquery_sj_loosescan_jcl6.test => mysql-test/t/subquery_sj_loosescan_bka.test mysql-test/t/subquery_sj_loosescan_jcl7.test => mysql-test/t/subquery_sj_loosescan_bkaunique.test mysql-test/t/subquery_sj_mat_jcl6.test => mysql-test/t/subquery_sj_mat_bka.test mysql-test/t/subquery_sj_mat_jcl7.test => mysql-test/t/subquery_sj_mat_bkaunique.test mysql-test/t/subquery_sj_none_jcl6.test => mysql-test/t/subquery_sj_none_bka.test mysql-test/t/subquery_sj_none_jcl7.test => mysql-test/t/subquery_sj_none_bkaunique.test sql/server_ids.h => sql/dynamic_ids.h modified: client/client_priv.h client/get_password.c client/mysql.cc client/mysqladmin.cc client/mysqlcheck.c client/mysqldump.c client/mysqlimport.c client/mysqlshow.c client/mysqlslap.c client/mysqltest.cc extra/CMakeLists.txt extra/innochecksum.c extra/yassl/CMakeLists.txt extra/yassl/src/yassl_int.cpp include/my_pthread.h include/mysql.h include/mysql.h.pp include/mysql/psi/psi.h include/mysql/psi/psi_abi_v1.h.pp include/mysql/psi/psi_abi_v2.h.pp include/mysql_com.h include/sql_common.h include/sslopt-case.h include/sslopt-longopts.h include/sslopt-vars.h include/violite.h mysql-test/collections/default.daily mysql-test/collections/default.experimental mysql-test/collections/default.weekly mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test mysql-test/extra/rpl_tests/rpl_conflicts.test mysql-test/extra/rpl_tests/rpl_crash_safe.inc mysql-test/extra/rpl_tests/rpl_crash_safe.test mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/extra/rpl_tests/rpl_extra_col_slave.test mysql-test/extra/rpl_tests/rpl_loaddata.test mysql-test/extra/rpl_tests/rpl_mixing_engines.inc mysql-test/extra/rpl_tests/rpl_relayrotate.test mysql-test/extra/rpl_tests/rpl_row_basic.test mysql-test/extra/rpl_tests/rpl_row_empty_imgs.test mysql-test/extra/rpl_tests/rpl_row_tabledefs.test mysql-test/extra/rpl_tests/rpl_stm_EE_err2.test mysql-test/extra/rpl_tests/rpl_stop_middle_group.test mysql-test/include/check-testcase.test mysql-test/include/join_cache.inc mysql-test/include/mrr_tests.inc mysql-test/include/mtr_check.sql mysql-test/include/mtr_warnings.sql mysql-test/include/plugin.defs mysql-test/include/wait_for_slave_param.inc mysql-test/lib/mtr_cases.pm mysql-test/r/1st.result mysql-test/r/archive_gis.result mysql-test/r/compress.result mysql-test/r/connect.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/derived.result mysql-test/r/distinct.result mysql-test/r/error_simulation.result mysql-test/r/explain.result mysql-test/r/func_gconcat.result mysql-test/r/func_group.result mysql-test/r/func_group_innodb.result mysql-test/r/func_str.result mysql-test/r/gis.result mysql-test/r/grant_explain_non_select.result mysql-test/r/greedy_optimizer.result mysql-test/r/group_by.result mysql-test/r/group_min_max.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/innodb_explain_non_select_all.result mysql-test/r/innodb_explain_non_select_none.result 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_cost.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/innodb_mrr_cost_icp.result mysql-test/r/innodb_mrr_icp.result mysql-test/r/innodb_mrr_none.result mysql-test/r/join.result mysql-test/r/join_nested.result mysql-test/r/join_outer.result mysql-test/r/key_diff.result mysql-test/r/log_state.result mysql-test/r/log_tables.result mysql-test/r/log_tables_upgrade.result mysql-test/r/myisam.result mysql-test/r/myisam_explain_non_select_all.result mysql-test/r/myisam_explain_non_select_none.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_cost.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/myisam_mrr_cost_icp.result mysql-test/r/myisam_mrr_icp.result mysql-test/r/myisam_mrr_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/named_pipe.result mysql-test/r/null_key_all.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_all.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/ps.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/row.result mysql-test/r/select_all.result mysql-test/r/select_icp_mrr.result mysql-test/r/select_none.result mysql-test/r/shm.result mysql-test/r/ssl.result mysql-test/r/ssl_compress.result mysql-test/r/subquery_all.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_none.result mysql-test/r/subquery_sj_all.result mysql-test/r/subquery_sj_dupsweed.result mysql-test/r/subquery_sj_firstmatch.result mysql-test/r/subquery_sj_innodb_none.result mysql-test/r/subquery_sj_loosescan.result mysql-test/r/subquery_sj_mat.result mysql-test/r/subquery_sj_mat_nosj.result mysql-test/r/subquery_sj_none.result mysql-test/r/subselect_innodb.result mysql-test/r/system_mysql_db.result mysql-test/r/union.result mysql-test/r/variables.result mysql-test/r/view.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/innodb/r/innodb_gis.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb.test mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/opt_trace/include/general2.inc mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_all.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_all.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/perfschema/include/schema.inc mysql-test/suite/perfschema/include/start_server_common.inc mysql-test/suite/perfschema/r/aggregate.result mysql-test/suite/perfschema/r/csv_table_io.result mysql-test/suite/perfschema/r/dml_setup_timers.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/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/ortho_iter.result mysql-test/suite/perfschema/r/part_table_io.result mysql-test/suite/perfschema/r/pfs_upgrade.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/rollback_table_io.result mysql-test/suite/perfschema/r/schema.result mysql-test/suite/perfschema/r/start_server_innodb.result mysql-test/suite/perfschema/r/start_server_no_account.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_host.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_setup_actors.result mysql-test/suite/perfschema/r/start_server_no_setup_objects.result mysql-test/suite/perfschema/r/start_server_no_stage_class.result mysql-test/suite/perfschema/r/start_server_no_stages_history.result mysql-test/suite/perfschema/r/start_server_no_stages_history_long.result mysql-test/suite/perfschema/r/start_server_no_statement_class.result mysql-test/suite/perfschema/r/start_server_no_statements_history.result mysql-test/suite/perfschema/r/start_server_no_statements_history_long.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_no_user.result mysql-test/suite/perfschema/r/start_server_no_waits_history.result mysql-test/suite/perfschema/r/start_server_no_waits_history_long.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/table_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_aggregate_off.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_io_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_global_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_hist_4u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result mysql-test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result mysql-test/suite/perfschema/r/table_schema.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/dml_setup_timers.test mysql-test/suite/perfschema/t/ortho_iter.test mysql-test/suite/perfschema/t/privilege.test mysql-test/suite/perfschema/t/start_server_nothing-master.opt mysql-test/suite/perfschema/t/start_server_nothing.test mysql-test/suite/rpl/r/rpl_circular_for_4_hosts.result mysql-test/suite/rpl/r/rpl_corruption.result mysql-test/suite/rpl/r/rpl_do_grant.result mysql-test/suite/rpl/r/rpl_extra_col_slave_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.result mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result mysql-test/suite/rpl/r/rpl_heartbeat_basic.result mysql-test/suite/rpl/r/rpl_known_bugs_detection.result mysql-test/suite/rpl/r/rpl_loaddata.result mysql-test/suite/rpl/r/rpl_loaddata_fatal.result mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.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_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_relayrotate.result mysql-test/suite/rpl/r/rpl_rotate_logs.result mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result mysql-test/suite/rpl/r/rpl_row_basic_3innodb.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_corruption.result mysql-test/suite/rpl/r/rpl_row_crash_safe.result mysql-test/suite/rpl/r/rpl_row_event_max_size.result mysql-test/suite/rpl/r/rpl_row_idempotency.result mysql-test/suite/rpl/r/rpl_row_img_eng_full.result mysql-test/suite/rpl/r/rpl_row_img_sanity.result mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result mysql-test/suite/rpl/r/rpl_row_mixing_engines.result mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result mysql-test/suite/rpl/r/rpl_show_errors.result mysql-test/suite/rpl/r/rpl_slave_grp_exec.result mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result mysql-test/suite/rpl/r/rpl_slave_start.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_EE_err2.result mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result mysql-test/suite/rpl/r/rpl_stm_conflicts.result mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result mysql-test/suite/rpl/r/rpl_stm_loaddata_concurrent.result mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-test/suite/rpl/r/rpl_typeconv.result mysql-test/suite/rpl/r/rpl_user.result mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test mysql-test/suite/rpl/t/rpl_bug26395.test mysql-test/suite/rpl/t/rpl_circular_for_4_hosts.test mysql-test/suite/rpl/t/rpl_corruption.test mysql-test/suite/rpl/t/rpl_cross_version.test mysql-test/suite/rpl/t/rpl_deadlock_innodb.test mysql-test/suite/rpl/t/rpl_dual_pos_advance.test mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test mysql-test/suite/rpl/t/rpl_grant_plugin.test mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-test/suite/rpl/t/rpl_known_bugs_detection.test mysql-test/suite/rpl/t/rpl_loaddata_fatal.test mysql-test/suite/rpl/t/rpl_migration_crash_safe.test mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test mysql-test/suite/rpl/t/rpl_packet.test mysql-test/suite/rpl/t/rpl_rotate_logs.test mysql-test/suite/rpl/t/rpl_row_colSize.test mysql-test/suite/rpl/t/rpl_row_corruption.test mysql-test/suite/rpl/t/rpl_row_crash_safe.test mysql-test/suite/rpl/t/rpl_row_event_max_size.test mysql-test/suite/rpl/t/rpl_row_idempotency.test mysql-test/suite/rpl/t/rpl_row_img_sanity.test mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test mysql-test/suite/rpl/t/rpl_row_mixing_engines.test mysql-test/suite/rpl/t/rpl_row_until.test mysql-test/suite/rpl/t/rpl_seconds_behind_master.test mysql-test/suite/rpl/t/rpl_server_id2.test mysql-test/suite/rpl/t/rpl_show_errors.test mysql-test/suite/rpl/t/rpl_slave_grp_exec.test mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test mysql-test/suite/rpl/t/rpl_slave_skip.test mysql-test/suite/rpl/t/rpl_slave_start.test mysql-test/suite/rpl/t/rpl_stm_000001.test mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test mysql-test/suite/rpl/t/rpl_stm_until.test mysql-test/suite/rpl/t/rpl_stop_slave.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/t/rpl_typeconv.test mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc mysql-test/suite/sys_vars/r/max_seeks_for_key_func.result mysql-test/suite/sys_vars/r/optimizer_switch_basic.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_32.result mysql-test/suite/sys_vars/r/slave_transaction_retries_basic_64.result mysql-test/suite/sys_vars/t/disabled.def mysql-test/t/group_by.test mysql-test/t/plugin_auth.test mysql-test/t/subquery_sj_firstmatch.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 mysys/psi_noop.cc scripts/mysql_system_tables.sql scripts/mysql_system_tables_fix.sql sql-common/client.c sql/CMakeLists.txt sql/binlog.cc sql/binlog.h sql/event_parse_data.cc sql/events.cc sql/field.cc sql/lex.h sql/lock.cc sql/log_event.cc sql/log_event.h sql/mysqld.cc sql/mysqld.h sql/net_serv.cc sql/opt_explain.cc 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.h sql/rpl_info_table.cc sql/rpl_info_table.h sql/rpl_info_table_access.cc sql/rpl_info_table_access.h sql/rpl_mi.cc sql/rpl_mi.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/set_var.cc sql/set_var.h sql/share/errmsg-utf8.txt sql/sp.cc sql/sql_acl.cc sql/sql_acl.h sql/sql_base.cc sql/sql_binlog.cc sql/sql_class.cc sql/sql_class.h sql/sql_connect.cc sql/sql_db.cc sql/sql_derived.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_priv.h sql/sql_rename.cc sql/sql_select.cc sql/sql_select.h sql/sql_table.cc sql/sql_trigger.cc sql/sql_view.cc sql/sql_yacc.yy sql/sys_vars.cc sql/table.cc sql/table.h storage/blackhole/ha_blackhole.cc storage/innobase/CMakeLists.txt storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/data/data0type.c storage/innobase/handler/ha_innodb.cc storage/innobase/include/btr0sea.h storage/innobase/include/buf0buf.h storage/innobase/include/data0type.h storage/innobase/include/data0type.ic storage/innobase/include/dict0mem.h storage/innobase/include/page0zip.h storage/innobase/include/srv0conc.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0trx.h storage/innobase/include/trx0trx.ic storage/innobase/include/univ.i storage/innobase/page/page0zip.c storage/innobase/row/row0umod.c storage/innobase/srv/srv0conc.c storage/innobase/srv/srv0srv.c storage/innobase/srv/srv0start.c storage/innobase/trx/trx0trx.c storage/perfschema/CMakeLists.txt storage/perfschema/ha_perfschema.cc storage/perfschema/pfs.cc storage/perfschema/pfs_column_types.h storage/perfschema/pfs_column_values.cc storage/perfschema/pfs_column_values.h storage/perfschema/pfs_engine_table.cc storage/perfschema/pfs_events_waits.h storage/perfschema/pfs_global.cc 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_server.cc storage/perfschema/pfs_server.h storage/perfschema/pfs_stat.h storage/perfschema/pfs_timer.cc storage/perfschema/pfs_timer.h storage/perfschema/pfs_visitor.cc storage/perfschema/pfs_visitor.h storage/perfschema/table_all_instr.cc storage/perfschema/table_all_instr.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_by_account_by_event_name.cc storage/perfschema/table_ews_by_host_by_event_name.cc storage/perfschema/table_ews_by_thread_by_event_name.cc storage/perfschema/table_ews_by_user_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.cc storage/perfschema/table_ews_global_by_event_name.h storage/perfschema/table_helper.h storage/perfschema/table_setup_instruments.cc storage/perfschema/table_setup_instruments.h storage/perfschema/table_setup_timers.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/mysql.spec.sh vio/vio.c vio/viopipe.c vio/vioshm.c vio/viosocket.c vio/viossl.c vio/viosslfactories.c mysql-test/r/join_cache_nojb.result mysql-test/r/join_cache_bnl.result mysql-test/r/join_cache_bka.result mysql-test/r/join_cache_bkaunique.result mysql-test/r/join_nested_bka.result mysql-test/r/join_outer_bka.result mysql-test/r/select_all_bka.result mysql-test/r/select_icp_mrr_bka.result mysql-test/r/select_none_bka.result mysql-test/r/subquery_all_bka.result mysql-test/r/subquery_nomat_nosj_bka.result mysql-test/r/subquery_none_bka.result mysql-test/r/subquery_sj_all_bka.result mysql-test/r/subquery_sj_all_bkaunique.result mysql-test/r/subquery_sj_dupsweed_bka.result mysql-test/r/subquery_sj_dupsweed_bkaunique.result mysql-test/r/subquery_sj_firstmatch_bka.result mysql-test/r/subquery_sj_firstmatch_bkaunique.result mysql-test/r/subquery_sj_innodb_all_bka.result mysql-test/r/subquery_sj_innodb_all_bkaunique.result mysql-test/r/subquery_sj_innodb_none_bka.result mysql-test/r/subquery_sj_innodb_none_bkaunique.result mysql-test/r/subquery_sj_loosescan_bka.result mysql-test/r/subquery_sj_loosescan_bkaunique.result mysql-test/r/subquery_sj_mat_bka.result mysql-test/r/subquery_sj_mat_bkaunique.result mysql-test/r/subquery_sj_none_bka.result mysql-test/r/subquery_sj_none_bkaunique.result mysql-test/t/join_cache_nojb.test mysql-test/t/join_cache_bnl.test mysql-test/t/join_cache_bka.test mysql-test/t/join_cache_bkaunique.test mysql-test/t/join_nested_bka.test mysql-test/t/join_outer_bka.test mysql-test/t/select_all_bka.test mysql-test/t/select_icp_mrr_bka.test mysql-test/t/select_none_bka.test mysql-test/t/subquery_all_bka.test mysql-test/t/subquery_nomat_nosj_bka.test mysql-test/t/subquery_none_bka.test mysql-test/t/subquery_sj_all_bka.test mysql-test/t/subquery_sj_all_bkaunique.test mysql-test/t/subquery_sj_dupsweed_bka.test mysql-test/t/subquery_sj_dupsweed_bkaunique.test mysql-test/t/subquery_sj_firstmatch_bka.test mysql-test/t/subquery_sj_firstmatch_bkaunique.test mysql-test/t/subquery_sj_innodb_all_bka.test mysql-test/t/subquery_sj_innodb_all_bkaunique.test mysql-test/t/subquery_sj_innodb_none_bka.test mysql-test/t/subquery_sj_innodb_none_bkaunique.test mysql-test/t/subquery_sj_loosescan_bka.test mysql-test/t/subquery_sj_loosescan_bkaunique.test mysql-test/t/subquery_sj_mat_bka.test mysql-test/t/subquery_sj_mat_bkaunique.test mysql-test/t/subquery_sj_none_bka.test mysql-test/t/subquery_sj_none_bkaunique.test sql/dynamic_ids.h 3103 Bjorn Munch 2011-08-18 [merge] merge from trunk added: mysql-test/r/multi_plugin_load.result mysql-test/r/multi_plugin_load_add.result mysql-test/r/multi_plugin_load_add2.result mysql-test/r/optimizer_bug12837084.result mysql-test/suite/innodb/r/innodb_bug59733.result mysql-test/suite/innodb/r/innodb_corrupt_bit.result mysql-test/suite/innodb/t/innodb_bug59733.test mysql-test/suite/innodb/t/innodb_corrupt_bit.test mysql-test/suite/sys_vars/r/ignore_db_dirs_basic.result mysql-test/suite/sys_vars/r/innodb_force_load_corrupted_basic.result mysql-test/suite/sys_vars/r/innodb_large_prefix_basic.result mysql-test/suite/sys_vars/t/ignore_db_dirs_basic-master.opt mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test mysql-test/suite/sys_vars/t/innodb_force_load_corrupted_basic.test mysql-test/suite/sys_vars/t/innodb_large_prefix_basic.test mysql-test/t/multi_plugin_load-master.opt mysql-test/t/multi_plugin_load.test mysql-test/t/multi_plugin_load_add-master.opt mysql-test/t/multi_plugin_load_add.test mysql-test/t/multi_plugin_load_add2-master.opt mysql-test/t/multi_plugin_load_add2.test mysql-test/t/optimizer_bug12837084.test modified: include/my_base.h mysql-test/collections/default.experimental mysql-test/include/join_cache.inc mysql-test/include/plugin.defs mysql-test/include/range.inc mysql-test/mysql-test-run.pl mysql-test/r/derived.result mysql-test/r/explain.result mysql-test/r/func_gconcat.result mysql-test/r/grant2.result mysql-test/r/heap.result mysql-test/r/index_merge_myisam.result mysql-test/r/information_schema.result mysql-test/r/innodb_explain_non_select_none.result mysql-test/r/innodb_icp_all.result mysql-test/r/innodb_mrr_all.result mysql-test/r/innodb_mrr_cost_all.result mysql-test/r/join_cache_jcl0.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/myisam_explain_non_select_none.result mysql-test/r/myisam_icp_all.result mysql-test/r/myisam_mrr_all.result mysql-test/r/myisam_mrr_cost_all.result mysql-test/r/mysqld--help-notwin.result mysql-test/r/mysqld--help-win.result mysql-test/r/range_all.result mysql-test/r/range_icp.result mysql-test/r/range_icp_mrr.result mysql-test/r/range_mrr.result mysql-test/r/range_mrr_cost.result mysql-test/r/range_none.result mysql-test/r/row.result mysql-test/r/subquery_all.result mysql-test/r/subquery_nomat_nosj.result mysql-test/r/subquery_none.result mysql-test/r/view.result mysql-test/suite/funcs_1/datadict/datadict_priv.inc mysql-test/suite/funcs_1/r/processlist_priv_no_prot.result mysql-test/suite/funcs_1/r/processlist_priv_ps.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/opt_trace/r/bugs_no_prot_none.result mysql-test/suite/opt_trace/r/bugs_ps_prot_none.result mysql-test/suite/opt_trace/r/charset.result mysql-test/suite/opt_trace/r/general2_no_prot.result mysql-test/suite/opt_trace/r/general2_ps_prot.result mysql-test/suite/opt_trace/r/general_no_prot_none.result mysql-test/suite/opt_trace/r/general_ps_prot_none.result mysql-test/suite/opt_trace/r/range_no_prot.result mysql-test/suite/opt_trace/r/range_ps_prot.result mysql-test/suite/opt_trace/r/security_no_prot.result mysql-test/suite/opt_trace/r/security_ps_prot.result mysql-test/suite/rpl/r/rpl_heartbeat.result mysql-test/suite/rpl/t/rpl_heartbeat.test mysql-test/suite/sys_vars/r/all_vars.result mysql-test/suite/sys_vars/r/innodb_file_per_table_basic.result mysql-test/suite/sys_vars/r/innodb_lock_wait_timeout_basic.result mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test mysql-test/suite/sys_vars/t/innodb_fast_shutdown_basic.test mysql-test/suite/sys_vars/t/innodb_file_per_table_basic.test mysql-test/suite/sys_vars/t/innodb_io_capacity_basic.test mysql-test/suite/sys_vars/t/innodb_lock_wait_timeout_basic.test mysql-test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test mysql-test/t/derived.test mysql-test/t/grant2.test mysql-test/t/heap.test mysql-test/t/join.test mysys/my_handler_errors.h sql/authors.h sql/field.h sql/handler.cc sql/item_cmpfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/key.h sql/mysqld.cc sql/mysqld.h sql/opt_explain.cc sql/opt_range.cc sql/opt_range.h sql/opt_sum.cc sql/records.cc sql/records.h sql/share/errmsg-utf8.txt sql/sql_alter.cc sql/sql_base.cc sql/sql_class.cc sql/sql_class.h sql/sql_cursor.cc sql/sql_derived.cc sql/sql_derived.h sql/sql_insert.cc sql/sql_join_cache.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_list.h sql/sql_parse.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_prepare.cc sql/sql_select.cc sql/sql_select.h sql/sql_show.cc sql/sql_show.h sql/sql_union.cc sql/sql_update.cc sql/sql_view.cc sql/structs.h sql/sys_vars.cc sql/table.cc sql/table.h storage/heap/hp_hash.c storage/innobase/btr/btr0btr.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/btr/btr0sea.c storage/innobase/buf/buf0buf.c storage/innobase/buf/buf0flu.c storage/innobase/buf/buf0lru.c storage/innobase/dict/dict0crea.c storage/innobase/dict/dict0dict.c storage/innobase/dict/dict0load.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/btr0btr.h storage/innobase/include/btr0btr.ic storage/innobase/include/buf0lru.h storage/innobase/include/db0err.h storage/innobase/include/dict0boot.h storage/innobase/include/dict0dict.h storage/innobase/include/dict0dict.ic storage/innobase/include/dict0mem.h storage/innobase/include/dict0priv.ic storage/innobase/include/dict0types.h storage/innobase/include/srv0srv.h storage/innobase/include/sync0sync.h storage/innobase/include/trx0sys.h storage/innobase/pars/pars0opt.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/sync/sync0sync.c storage/innobase/ut/ut0ut.c unittest/gunit/sql_list-t.cc Diff too large for email (223192 lines, the limit is 10000). No bundle (reason: useless for push emails).