Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/mysql-5-6/mysql-56test.p5m
branchs11u3-sru
changeset 6285 8e22d153c3d9
parent 6284 71199f3a4dcd
child 6570 255c6d88d419 
--- a/components/mysql-5-6/mysql-56test.p5m	Sat Jun 25 10:48:59 2016 -0700
+++ b/components/mysql-5-6/mysql-56test.p5m	Sat Jun 25 11:17:54 2016 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/mysql/5.6/bin/.+ -> set pkg.depend.bypass-generate .*>
-<transform file path=usr/mysql/5.6/mysql-test/lib/My/SafeProcess/my_safe_process -> set pkg.depend.bypass-generate .*>
+
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/database/mysql-56/tests@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -36,6 +35,7 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2014/431
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
 file path=usr/mysql/5.6/bin/mysql_client_test
 file path=usr/mysql/5.6/bin/mysql_client_test_embedded
 file path=usr/mysql/5.6/bin/mysqltest_embedded
@@ -69,7 +69,6 @@
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_cache_stat.test
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_implicit_commit.inc
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_innodb.inc
-file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_insert_delayed.test
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_fill.inc
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_row.inc
 file path=usr/mysql/5.6/mysql-test/extra/binlog_tests/binlog_mysqlbinlog_start_stop.inc
@@ -123,9 +122,6 @@
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_foreign_key.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_gtid_drop_table.inc
-file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_gtid_mts_relay_log_recovery.test
-file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_gtid_temp_table_in_func_or_trigger.inc
-file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_gtids_restart_slave_io_lost_trx.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_heartbeat_2slaves.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_ignore_table_filter_insensitive.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_ignore_table_filter_sensitive.inc
@@ -147,7 +143,6 @@
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mixing_engines.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_crash_safe.test
-file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_query.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_update.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_multi_update2.test
@@ -159,7 +154,6 @@
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_record_compare.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_relayrotate.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_reset_slave.test
-file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_rollback_to_savepoint.inc
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_row_001.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_row_UUID.test
 file path=usr/mysql/5.6/mysql-test/extra/rpl_tests/rpl_row_basic.test
@@ -204,7 +198,6 @@
 file path=usr/mysql/5.6/mysql-test/include/analyze-timeout.test
 file path=usr/mysql/5.6/mysql-test/include/assert.inc
 file path=usr/mysql/5.6/mysql-test/include/assert_command_output.inc
-file path=usr/mysql/5.6/mysql-test/include/assert_grep.inc
 file path=usr/mysql/5.6/mysql-test/include/begin_include_file.inc
 file path=usr/mysql/5.6/mysql-test/include/big_test.inc
 file path=usr/mysql/5.6/mysql-test/include/binlog_inject_error.inc
@@ -289,7 +282,6 @@
 file path=usr/mysql/5.6/mysql-test/include/func_in.inc
 file path=usr/mysql/5.6/mysql-test/include/function_defaults.inc
 file path=usr/mysql/5.6/mysql-test/include/function_defaults_notembedded.inc
-file path=usr/mysql/5.6/mysql-test/include/get_file_permissions.inc
 file path=usr/mysql/5.6/mysql-test/include/get_ndb_epochs.inc
 file path=usr/mysql/5.6/mysql-test/include/get_relay_log_pos.inc
 file path=usr/mysql/5.6/mysql-test/include/gis_debug.inc
@@ -363,7 +355,6 @@
 file path=usr/mysql/5.6/mysql-test/include/have_memcached_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/have_mrr.inc
 file path=usr/mysql/5.6/mysql-test/include/have_multi_ndb.inc
-file path=usr/mysql/5.6/mysql-test/include/have_mysql_no_login_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/have_mysql_upgrade.inc
 file path=usr/mysql/5.6/mysql-test/include/have_ndb.inc
 file path=usr/mysql/5.6/mysql-test/include/have_ndb_extra.inc
@@ -371,7 +362,6 @@
 file path=usr/mysql/5.6/mysql-test/include/have_nodebug.inc
 file path=usr/mysql/5.6/mysql-test/include/have_not_innodb_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/have_null_audit_plugin.inc
-file path=usr/mysql/5.6/mysql-test/include/have_numa.inc
 file path=usr/mysql/5.6/mysql-test/include/have_openssl.inc
 file path=usr/mysql/5.6/mysql-test/include/have_optimizer_trace.inc
 file path=usr/mysql/5.6/mysql-test/include/have_outfile.inc
@@ -400,7 +390,6 @@
 file path=usr/mysql/5.6/mysql-test/include/have_utf32.inc
 file path=usr/mysql/5.6/mysql-test/include/have_utf8.inc
 file path=usr/mysql/5.6/mysql-test/include/have_utf8mb4.inc
-file path=usr/mysql/5.6/mysql-test/include/have_util_nc.inc
 file path=usr/mysql/5.6/mysql-test/include/have_valgrind.inc
 file path=usr/mysql/5.6/mysql-test/include/have_validate_password_plugin.inc
 file path=usr/mysql/5.6/mysql-test/include/ib_logfile_size_check.inc
@@ -463,7 +452,6 @@
 file path=usr/mysql/5.6/mysql-test/include/ndb_restore_slave_eoption.inc
 file path=usr/mysql/5.6/mysql-test/include/ndb_setup_slave.inc
 file path=usr/mysql/5.6/mysql-test/include/ndb_wait_connected.inc
-file path=usr/mysql/5.6/mysql-test/include/no_protocol.inc
 file path=usr/mysql/5.6/mysql-test/include/no_running_event_scheduler.inc
 file path=usr/mysql/5.6/mysql-test/include/no_running_events.inc
 file path=usr/mysql/5.6/mysql-test/include/no_valgrind_without_big.inc
@@ -565,8 +553,6 @@
 file path=usr/mysql/5.6/mysql-test/include/set_binlog_format_row.sql
 file path=usr/mysql/5.6/mysql-test/include/set_binlog_format_statement.sql
 file path=usr/mysql/5.6/mysql-test/include/setup_fake_relay_log.inc
-file path=usr/mysql/5.6/mysql-test/include/show_all_binlogs.inc
-file path=usr/mysql/5.6/mysql-test/include/show_all_relay_logs.inc
 file path=usr/mysql/5.6/mysql-test/include/show_binary_logs.inc
 file path=usr/mysql/5.6/mysql-test/include/show_binlog_events.inc
 file path=usr/mysql/5.6/mysql-test/include/show_binlog_events2.inc
@@ -630,7 +616,6 @@
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_sql_to_stop.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_start.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_stop.inc
-file path=usr/mysql/5.6/mysql-test/include/wait_for_slave_to_sync_with_master.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_for_status_var.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_innodb_all_purged.inc
 file path=usr/mysql/5.6/mysql-test/include/wait_show_condition.inc
@@ -770,7 +755,6 @@
 file path=usr/mysql/5.6/mysql-test/r/concurrent_innodb_safelog.result
 file path=usr/mysql/5.6/mysql-test/r/concurrent_innodb_unsafelog.result
 file path=usr/mysql/5.6/mysql-test/r/connect.result
-file path=usr/mysql/5.6/mysql-test/r/connect_debug.result
 file path=usr/mysql/5.6/mysql-test/r/consistent_snapshot.result
 file path=usr/mysql/5.6/mysql-test/r/constraints.result
 file path=usr/mysql/5.6/mysql-test/r/count_distinct.result
@@ -789,7 +773,6 @@
 file path=usr/mysql/5.6/mysql-test/r/ctype_collate.result
 file path=usr/mysql/5.6/mysql-test/r/ctype_cp1250_ch.result
 file path=usr/mysql/5.6/mysql-test/r/ctype_cp1251.result
-file path=usr/mysql/5.6/mysql-test/r/ctype_cp932.result
 file path=usr/mysql/5.6/mysql-test/r/ctype_cp932_binlog_row.result
 file path=usr/mysql/5.6/mysql-test/r/ctype_cp932_binlog_stm.result
 file path=usr/mysql/5.6/mysql-test/r/ctype_create.result
@@ -852,7 +835,6 @@
 file path=usr/mysql/5.6/mysql-test/r/ds_mrr-big.result
 file path=usr/mysql/5.6/mysql-test/r/dynamic_tracing.result
 file path=usr/mysql/5.6/mysql-test/r/empty_table.result
-file path=usr/mysql/5.6/mysql-test/r/enable_cleartext_plugin.result
 file path=usr/mysql/5.6/mysql-test/r/endspace.result
 file path=usr/mysql/5.6/mysql-test/r/eq_range_idx_stat.result
 file path=usr/mysql/5.6/mysql-test/r/error_simulation.result
@@ -935,8 +917,6 @@
 file path=usr/mysql/5.6/mysql-test/r/func_sapdb.result
 file path=usr/mysql/5.6/mysql-test/r/func_set.result
 file path=usr/mysql/5.6/mysql-test/r/func_str.result
-file path=usr/mysql/5.6/mysql-test/r/func_str_debug.result
-file path=usr/mysql/5.6/mysql-test/r/func_str_no_ps.result
 file path=usr/mysql/5.6/mysql-test/r/func_system.result
 file path=usr/mysql/5.6/mysql-test/r/func_test.result
 file path=usr/mysql/5.6/mysql-test/r/func_time.result
@@ -1050,14 +1030,11 @@
 file path=usr/mysql/5.6/mysql-test/r/innodb_mrr_cost.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mrr_cost_all.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mrr_cost_icp.result
-file path=usr/mysql/5.6/mysql-test/r/innodb_mrr_icp.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mrr_none.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mysql_lock.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mysql_lock2.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_mysql_sync.result
 file path=usr/mysql/5.6/mysql-test/r/innodb_pk_extension_off.result
-file path=usr/mysql/5.6/mysql-test/r/innodb_pk_extension_on.result
-file path=usr/mysql/5.6/mysql-test/r/innodb_recovery_with_upper_case_names.result
 file path=usr/mysql/5.6/mysql-test/r/insert.result
 file path=usr/mysql/5.6/mysql-test/r/insert_notembedded.result
 file path=usr/mysql/5.6/mysql-test/r/insert_select.result
@@ -1100,8 +1077,6 @@
 file path=usr/mysql/5.6/mysql-test/r/lock_multi_bug38691.result
 file path=usr/mysql/5.6/mysql-test/r/lock_sync.result
 file path=usr/mysql/5.6/mysql-test/r/lock_tables_lost_commit.result
-file path=usr/mysql/5.6/mysql-test/r/log_empty_name.result
-file path=usr/mysql/5.6/mysql-test/r/log_errchk.result
 file path=usr/mysql/5.6/mysql-test/r/log_state.result
 file path=usr/mysql/5.6/mysql-test/r/log_state_bug33693.result
 file path=usr/mysql/5.6/mysql-test/r/log_tables-big.result
@@ -1113,11 +1088,11 @@
 file path=usr/mysql/5.6/mysql-test/r/lowercase1.require
 file path=usr/mysql/5.6/mysql-test/r/lowercase2.require
 file path=usr/mysql/5.6/mysql-test/r/lowercase_fs_off.result
-file path=usr/mysql/5.6/mysql-test/r/lowercase_fs_on.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_mixed_tmpdir.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_mixed_tmpdir_innodb.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_table.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_table2.result
+file path=usr/mysql/5.6/mysql-test/r/lowercase_table3.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_table4.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_table_grant.result
 file path=usr/mysql/5.6/mysql-test/r/lowercase_table_qcache.result
@@ -1128,6 +1103,7 @@
 file path=usr/mysql/5.6/mysql-test/r/merge.result
 file path=usr/mysql/5.6/mysql-test/r/merge_innodb.result
 file path=usr/mysql/5.6/mysql-test/r/merge_mmap.result
+file path=usr/mysql/5.6/mysql-test/r/merge_recover.result
 file path=usr/mysql/5.6/mysql-test/r/metadata.result
 file path=usr/mysql/5.6/mysql-test/r/mix2_myisam.result
 file path=usr/mysql/5.6/mysql-test/r/mix2_myisam_ucs2.result
@@ -1158,7 +1134,6 @@
 file path=usr/mysql/5.6/mysql-test/r/myisam_mrr_cost_icp.result
 file path=usr/mysql/5.6/mysql-test/r/myisam_mrr_icp.result
 file path=usr/mysql/5.6/mysql-test/r/myisam_mrr_none.result
-file path=usr/mysql/5.6/mysql-test/r/myisam_recover.result
 file path=usr/mysql/5.6/mysql-test/r/myisam_row_rpl.result
 file path=usr/mysql/5.6/mysql-test/r/myisampack.result
 file path=usr/mysql/5.6/mysql-test/r/mysql-bug41486.result
@@ -1181,7 +1156,6 @@
 file path=usr/mysql/5.6/mysql-test/r/mysqladmin.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_debug.result
-file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_mixed_or_statment.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_raw_mode.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_raw_mode_win.result
 file path=usr/mysql/5.6/mysql-test/r/mysqlbinlog_row_big.result
@@ -1349,7 +1323,6 @@
 file path=usr/mysql/5.6/mysql-test/r/row.result
 file path=usr/mysql/5.6/mysql-test/r/rowid_order_innodb.result
 file path=usr/mysql/5.6/mysql-test/r/rpl_colSize.result
-file path=usr/mysql/5.6/mysql-test/r/rpl_extraColmaster_innodb.result
 file path=usr/mysql/5.6/mysql-test/r/rpl_extraColmaster_myisam.result
 file path=usr/mysql/5.6/mysql-test/r/rpl_mysqldump_slave.result
 file path=usr/mysql/5.6/mysql-test/r/schema.result
@@ -1379,13 +1352,11 @@
 file path=usr/mysql/5.6/mysql-test/r/signal_demo2.result
 file path=usr/mysql/5.6/mysql-test/r/signal_demo3.result
 file path=usr/mysql/5.6/mysql-test/r/signal_sqlmode.result
-file path=usr/mysql/5.6/mysql-test/r/single_delete_update.result
 file path=usr/mysql/5.6/mysql-test/r/skip_grants.result
 file path=usr/mysql/5.6/mysql-test/r/skip_log_bin.result
 file path=usr/mysql/5.6/mysql-test/r/skip_name_resolve.result
 file path=usr/mysql/5.6/mysql-test/r/slave-running.result
 file path=usr/mysql/5.6/mysql-test/r/slave-stopped.result
-file path=usr/mysql/5.6/mysql-test/r/sort_buffer_size_functionality.result
 file path=usr/mysql/5.6/mysql-test/r/sp-big.result
 file path=usr/mysql/5.6/mysql-test/r/sp-bugs.result
 file path=usr/mysql/5.6/mysql-test/r/sp-code.result
@@ -1426,7 +1397,6 @@
 file path=usr/mysql/5.6/mysql-test/r/status.result
 file path=usr/mysql/5.6/mysql-test/r/status2.result
 file path=usr/mysql/5.6/mysql-test/r/status_bug17954.result
-file path=usr/mysql/5.6/mysql-test/r/status_debug.result
 file path=usr/mysql/5.6/mysql-test/r/strict.result
 file path=usr/mysql/5.6/mysql-test/r/strict_autoinc_1myisam.result
 file path=usr/mysql/5.6/mysql-test/r/strict_autoinc_2innodb.result
@@ -1492,7 +1462,6 @@
 file path=usr/mysql/5.6/mysql-test/r/table_open_cache_functionality.result
 file path=usr/mysql/5.6/mysql-test/r/tablelock.result
 file path=usr/mysql/5.6/mysql-test/r/tablespace.result
-file path=usr/mysql/5.6/mysql-test/r/temp_pool.result
 file path=usr/mysql/5.6/mysql-test/r/temp_table.result
 file path=usr/mysql/5.6/mysql-test/r/temporal_literal.result
 file path=usr/mysql/5.6/mysql-test/r/testdb_only.require
@@ -1578,11 +1547,7 @@
 file path=usr/mysql/5.6/mysql-test/std_data/bad_gis_data.dat
 file path=usr/mysql/5.6/mysql-test/std_data/binlog_savepoint.000001
 file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction.000001
-file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction_with_GTID.000001
-file path=usr/mysql/5.6/mysql-test/std_data/binlog_transaction_with_anonymous_GTID.000001
 file path=usr/mysql/5.6/mysql-test/std_data/bug15328.cnf
-file path=usr/mysql/5.6/mysql-test/std_data/bug16171518_1.dat
-file path=usr/mysql/5.6/mysql-test/std_data/bug16171518_2.dat
 file path=usr/mysql/5.6/mysql-test/std_data/bug16266.000001
 file path=usr/mysql/5.6/mysql-test/std_data/bug17532932.MYD
 file path=usr/mysql/5.6/mysql-test/std_data/bug17532932.MYI
@@ -1615,7 +1580,6 @@
 file path=usr/mysql/5.6/mysql-test/std_data/bug49823.CSM
 file path=usr/mysql/5.6/mysql-test/std_data/bug49823.CSV
 file path=usr/mysql/5.6/mysql-test/std_data/bug49823.frm
-file path=usr/mysql/5.6/mysql-test/std_data/ca-cert-verify.pem
 file path=usr/mysql/5.6/mysql-test/std_data/ca-sha512.pem
 file path=usr/mysql/5.6/mysql-test/std_data/cacert.pem
 file path=usr/mysql/5.6/mysql-test/std_data/charset_utf8.txt
@@ -1707,17 +1671,11 @@
 file path=usr/mysql/5.6/mysql-test/std_data/rsa_private_key.pem
 file path=usr/mysql/5.6/mysql-test/std_data/rsa_public_key.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server-cert-sha512.pem
-file path=usr/mysql/5.6/mysql-test/std_data/server-cert-verify-fail.pem
-file path=usr/mysql/5.6/mysql-test/std_data/server-cert-verify-pass.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server-cert.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server-key-sha512.pem
-file path=usr/mysql/5.6/mysql-test/std_data/server-key-verify-fail.pem
-file path=usr/mysql/5.6/mysql-test/std_data/server-key-verify-pass.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server-key.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server8k-cert.pem
 file path=usr/mysql/5.6/mysql-test/std_data/server8k-key.pem
-file path=usr/mysql/5.6/mysql-test/std_data/slave-relay-bin_linux.index
-file path=usr/mysql/5.6/mysql-test/std_data/slave-relay-bin_win.index
 file path=usr/mysql/5.6/mysql-test/std_data/system_tap.stp
 file path=usr/mysql/5.6/mysql-test/std_data/trunc_binlog.000001
 file path=usr/mysql/5.6/mysql-test/std_data/untrusted-cacert.pem
@@ -1742,12 +1700,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/include/not_sha256_rsa_auth.inc
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/include/not_ssl.inc
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/access_credential_control.result
-file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/cert_verify.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/have_mysql_upgrade.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/have_ssl.require
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/key_value_auth.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_native_plugin.result
-file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_no_login.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_old_passwords.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_old_plugin.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/mysql_sha256_plugin.result
@@ -1762,13 +1718,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/r/server_withssl_client_withssl.result
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/access_credential_control-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/access_credential_control.test
-file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/cert_verify.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/key_value_auth-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/key_value_auth.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/key_value_auth.test_old
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_native_plugin.test
-file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_no_login-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_no_login.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_passwords-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_passwords.test
 file path=usr/mysql/5.6/mysql-test/suite/auth_sec/t/mysql_old_plugin.test
@@ -1793,12 +1746,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_drop_if_exists.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_enforce_gtid_consistency.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_error_action.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_grant.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_cache.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_errors.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_exhausted.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_implicit_commit.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row.result
@@ -1806,7 +1757,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_row_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_mysqlbinlog_start_stop.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_row_ctype_ucs.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_simple_recovery.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_stm_ctype_ucs.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_gtid_utils.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_hexdump.result
@@ -1824,7 +1774,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_multi_engine.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog_concat.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog_filter.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
@@ -1836,7 +1785,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_query_filter_rules.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_reset_master.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_rewrite.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_rotate_bgc_sync.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_row_binlog.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_row_cache_stat.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
@@ -1880,8 +1828,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_variables_relay_log.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_variables_relay_log_index.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_write_error.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlog_xa_handling.result
-file path=usr/mysql/5.6/mysql-test/suite/binlog/r/show_binlog_events_no_lock.result
+file path=usr/mysql/5.6/mysql-test/suite/binlog/r/binlogging_impossible.result
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/bug11747887-bin.000003
 file path=usr/mysql/5.6/mysql-test/suite/binlog/std_data/bug32407.001
@@ -1906,16 +1853,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_delete_and_flush_index.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_enforce_gtid_consistency.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_error_action-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_error_action.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_grant.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_cache-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_cache.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_errors-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_errors.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_exhausted-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_exhausted.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_implicit_commit.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_innodb.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_mysqlbinlog_row.test
@@ -1923,7 +1866,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_mysqlbinlog_row_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_mysqlbinlog_start_stop.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_row_ctype_ucs.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_simple_recovery.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_stm_ctype_ucs.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_gtid_utils.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_hexdump.test
@@ -1946,7 +1888,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog_concat.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog_filter.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_innodb.test
@@ -1959,7 +1900,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_query_filter_rules.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_reset_master.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_rewrite.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_rotate_bgc_sync.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_row_binlog-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_row_binlog.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_row_cache_stat.test
@@ -1977,7 +1917,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_server_id.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_server_start_options.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_sf.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_simplified_binlog_gtid_recovery-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_spurious_ddl_errors.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_sql_mode.test
@@ -2018,9 +1957,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_variables_relay_log_index-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_variables_relay_log_index.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_write_error.test
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlog_xa_handling.test
+file path=usr/mysql/5.6/mysql-test/suite/binlog/t/binlogging_impossible.test
 file path=usr/mysql/5.6/mysql-test/suite/binlog/t/disabled.def
-file path=usr/mysql/5.6/mysql-test/suite/binlog/t/show_binlog_events_no_lock.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/README
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/r/ai_init_alter_table.result
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/r/ai_init_create_table.result
@@ -2635,7 +2573,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loaddata_m-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loaddata_m.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loaddata_s-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loaddata_s.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loaddatalocal.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_loadfile.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_log_pos.test
@@ -2649,7 +2586,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_multi_update4-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_multi_update4.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_ps.test
-file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_rbr_to_sbr.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_relayspace-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_relayspace.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_replicate_ignore_db-slave.opt
@@ -2693,7 +2629,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_start_stop_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_stm_mystery22.test
-file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_stm_no_op.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_switch_stm_row_mixed.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/funcs/t/rpl_temp_table.test
@@ -2905,7 +2840,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/include/check_for_error_rollback_skip.inc
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/include/check_repeatable_read_all_columns.inc
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/include/record_query_all_columns.inc
-file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/include/rr_init.test
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/init_innodb.txt
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/r/init_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/engines/rr_trx/r/rr_c_count_not_zero.result
@@ -3289,7 +3223,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/triggers/triggers_09.inc
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/views/func_view.inc
-file path=usr/mysql/5.6/mysql-test/suite/funcs_1/views/fv1.inc
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/views/fv2.inc
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/views/fv_cast.inc
 file path=usr/mysql/5.6/mysql-test/suite/funcs_1/views/fv_if1.inc
@@ -3311,30 +3244,19 @@
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/memory_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/myisam_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/funcs_2/t/suite.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb/include/checksum_not_strict.inc
-file path=usr/mysql/5.6/mysql-test/suite/innodb/include/import.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_dict.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats_table_flag.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb/include/innodb_stats_table_flag_analyze.inc
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/add_foreign_key.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/alter_rename_existing.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/analyze_table.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob-update-debug.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/blob_redo.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/checksum.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/create-index.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/dropdb.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/foreign_key.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/import.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/index_tree_operation.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-2byte-collation.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-ac-non-locking-select.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter-autoinc.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter-debug.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter-discard.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter-nullable.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter-tempfile.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-alter.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-analyze.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-autoinc-18274.result
@@ -3357,7 +3279,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-index-online.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-index.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-index_ucs2.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-lock-inherit-read_commited.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-lock.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-log-file-size-1.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-log-file-size.result
@@ -3387,7 +3308,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb-wl6445.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_autoinc_reset.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_blob_unrecoverable_crash.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_buffer_pool_load.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_bug-13628249.result
@@ -3460,13 +3380,13 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_file_format.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_force_recovery.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_gis.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_i_s_innodb_locks.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_i_s_innodb_trx.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_misc1.result
+file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_monitor.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_multi_update.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_mysql.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_mysql_rbk.result
@@ -3497,27 +3417,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_trx_weight.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb/r/innodb_ut_format_name.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/insert_debug.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/monitor.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/monitor_debug.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/sp_temp_table.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/strict_checksum.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/strict_mode.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/tmpdir.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/r/xa_recovery.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/add_foreign_key.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/alter_rename_existing.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/analyze_table.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob-update-debug.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/blob_redo.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/checksum.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/create-index.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/disabled.def
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/dropdb.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/foreign_key.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/import.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/index_tree_operation.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-2byte-collation-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-2byte-collation.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-ac-non-locking-select.test
@@ -3525,7 +3428,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-alter-debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-alter-discard.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-alter-nullable.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-alter-tempfile.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-alter.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-analyze.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-autoinc-18274.test
@@ -3546,7 +3448,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-consistent-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-consistent.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-double-write.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index-debug-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index-debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index-online-delete.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index-online-fk.test
@@ -3555,7 +3456,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index-online.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-index_ucs2.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-lock-inherit-read_commited.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-lock.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-log-file-size-1.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb-log-file-size.test
@@ -3590,7 +3490,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_autoinc_reset.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_blob_unrecoverable_crash.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_buffer_pool_load-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_buffer_pool_load.test
@@ -3670,6 +3569,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug60049.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug60196.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug60229-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug60229.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_bug70867.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
@@ -3677,7 +3577,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_ctype_ldml.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_file_format-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_file_format.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_force_recovery.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_gis.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_i_s_innodb_locks.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test
@@ -3686,6 +3585,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_lock_wait_timeout_1.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_misc1-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_misc1.test
+file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_monitor.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_multi_update.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_mysql-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_mysql.test
@@ -3721,18 +3621,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_trx_weight.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/innodb_ut_format_name.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/insert_debug.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/monitor.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/monitor_debug.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/portability_wl5980_linux.zip
 file path=usr/mysql/5.6/mysql-test/suite/innodb/t/portability_wl5980_windows.zip
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/sp_temp_table.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/strict_checksum.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/strict_mode.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/tmpdir.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb/t/xa_recovery.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fts_compatibility.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fts_compatibility_win.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext2.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/fulltext3.result
@@ -3762,11 +3652,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_savepoint.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/innodb_fts_transaction.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/phrase.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/r/subexpr.result
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/disabled.def
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fts_compatibility.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fts_compatibility_win.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext2.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/fulltext3.test
@@ -3797,107 +3683,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_savepoint.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/innodb_fts_transaction.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/phrase.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_fts/t/subexpr.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/include/innodb_stress.inc
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_crash_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_bigstress_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_crash_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_hugestress_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_blob.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_blob_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_crash_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/r/innodb_stress_nocompress.result
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/Readme
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_crash_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_bigstress_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_crash_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_hugestress_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_blob_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_crash_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/innodb_stress_nocompress.test
-file path=usr/mysql/5.6/mysql-test/suite/innodb_stress/t/load_generator.py
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_create_tab_indx.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_fetch_records.inc
 file path=usr/mysql/5.6/mysql-test/suite/innodb_zip/include/innodb_load_data.inc
@@ -4094,9 +3879,13 @@
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_create_tbl_ucs2.test
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_create_tbl_ujis.test
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_create_tbl_utf8.test
+file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_sjis-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_sjis.test
+file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_ucs2-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_ucs2.test
+file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_ujis-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_ujis.test
+file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_utf8-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_enum_utf8.test
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_insert_sjis.test
 file path=usr/mysql/5.6/mysql-test/suite/jp/t/jp_insert_ucs2.test
@@ -4381,7 +4170,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_conv_lossy_integral.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_conv_padding.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_conv_promotion.result
-file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_discover.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_misc.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_print.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb/r/ndb_restore_schema_blobs.result
@@ -4526,7 +4314,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_conv_lossy_integral.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_conv_padding.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_conv_promotion.test
-file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_discover.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_misc.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_print.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb/t/ndb_restore_schema_blobs.test
@@ -4589,7 +4376,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_ddl_multi.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_discover.result
-file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_format.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_ignore_db.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_apply_status.result
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/r/ndb_binlog_log_bin.result
@@ -4608,6 +4394,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_log_apply_status.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_log_bin.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_multi.test
+file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_restore-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_restore.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.cnf
 file path=usr/mysql/5.6/mysql-test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.test
@@ -4780,7 +4567,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/ndb_rpl_sync.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui2.test
-file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/ndb_rpl_ui3.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/ndb_rpl_xxx_innodb.inc
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb.test
 file path=usr/mysql/5.6/mysql-test/suite/ndb_rpl/t/rpl_truncate_7ndb_2.test
@@ -5297,6 +5083,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/have_aligned_memory.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/hostcache_dump.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/hostcache_set_state.inc
+file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/no_protocol.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/privilege.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/rpl_statements_truncate.inc
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/include/schema.inc
@@ -5393,9 +5180,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_threads.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_tiws_by_index_usage.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_tiws_by_table.result
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_tlws_by_table.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/ddl_users.result
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/digest_null_literal.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/digest_table_full.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_accounts.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_cond_instances.result
@@ -5443,7 +5228,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_setup_objects.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_setup_timers.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_socket_instances.result
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_socket_summary_by_event_name.result
 #file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_socket_summary_by_name.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_socket_summary_by_instance.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/dml_threads.result
@@ -5555,7 +5339,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_disable_statements.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_disable_waits.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_innodb.result
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_low_digest.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_account.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_cond_class.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
@@ -5637,7 +5420,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/threads_insert_delayed.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/threads_mysql.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/trigger_table_io.result
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/unary_digest.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/r/view_table_io.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/aggregate.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/all_tests.test
@@ -5723,7 +5505,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_tiws_by_table.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_tlws_by_table.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/ddl_users.test
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_null_literal.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_table_full-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/digest_table_full.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/disabled.def
@@ -5769,7 +5550,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_session_connect_attrs.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_actors.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_consumers.test
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_instruments.test
 #file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_instruments.result
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_objects.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/dml_setup_timers.test
@@ -5829,7 +5609,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_bad_deny.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_allow.test
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_good_deny.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/hostcache_ipv6_addrinfo_noname_allow.test
@@ -5938,8 +5717,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_disable_waits.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_innodb-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_innodb.test
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_low_digest-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_low_digest.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_account-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_account.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/start_server_no_cond_class-master.opt
@@ -6058,7 +5835,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/threads_mysql-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/threads_mysql.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/trigger_table_io.test
-file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/unary_digest.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema/t/view_table_io.test
 file path=usr/mysql/5.6/mysql-test/suite/perfschema_stress/README
 file path=usr/mysql/5.6/mysql-test/suite/perfschema_stress/include/settings.inc
@@ -6110,16 +5886,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter_db.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_alter_repository.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_avoid_temporal_upgrade.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_binlog_corruption.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_binlog_errors.result
@@ -6152,7 +5923,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_connection.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_corruption.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_crash_safe_master.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_crc_check.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_create_database.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_create_drop_temp_table.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
@@ -6171,15 +5941,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_do_table_filter_sensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_db.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_temp.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_temp_gtid.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_temp_tbl_with_rewrite_db.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_drop_view.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_dual_pos_advance.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_dump_thread_kill.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_empty_master_host.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_empty_multi_update.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_err_ignoredtable.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
@@ -6196,7 +5961,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_foreign_key_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_free_items.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_function_defaults.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gap_in_retrieved_gtid_set.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_general_log.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_geometry.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_get_lock.result
@@ -6204,7 +5968,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_grant.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_grant_plugin.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_group_commit_deadlock.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_binary_log_as_relay_log.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_binlog_errors.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_insensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_do_table_filter_sensitive.result
@@ -6217,13 +5980,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_loaddata_s.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode_off_new_master.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mode_on_new_master.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_parallel.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_purged_maintained.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_replay_relaylog.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_row_event_max_size.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_row_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_server_sighup.result
@@ -6231,10 +5990,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stm_insert_delayed.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stm_mix_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_stress_failover.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_temp_table.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_transaction_split_across_relay_logs.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtid_validate_slave_gtids.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_gtids_restart_slave_io_lost_trx.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
@@ -6281,7 +6036,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_locale.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_log_pos.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_lost_events_on_rotate.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_low_slave_net_time_out.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_manual_change_index_file.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_many_optimize.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_master_connection.result
@@ -6290,7 +6044,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_misc_functions.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mix_found_rows.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mix_insert_delayed.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mix_missing_data_on_slave.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_bit_pk.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_ddl_dml.result
@@ -6299,11 +6052,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_debug.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_slave_hang_with_partial_trx.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_mts_stop_slave.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_delete.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_delete2.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_multi_engine.result
@@ -6346,9 +6094,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_read_old_relay_log_info.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_read_only.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_recovery_empty_sqlthd_pos.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_recovery_replicate_same_server_id.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relay_log_recovery_positions.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relay_space_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relay_space_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_relayrotate.result
@@ -6361,7 +6106,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_report_port.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rewrite_db_filter.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rewrt_db.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rotate_gtid.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rotate_logs.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_rotate_row_trans.result
@@ -6428,7 +6172,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_rec_comp_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_record_find_myisam.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_reset_slave.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_rollback_to_savepoint.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_sp001.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_sp002_innodb.result
@@ -6456,15 +6199,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_view01.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_row_wide_table.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_savepoint.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sbm_previous_gtid_event.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_seconds_behind_master.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_deadlock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_event.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_future_logpos.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sequential.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_server_id1.result
@@ -6479,7 +6219,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_master_info_file.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_running.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_show_slave_status_deadlock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_ddl_errors_cli.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_error.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_skip_incident.result
@@ -6495,11 +6234,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp004.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp_effects.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sp_privileges.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_spec_variables.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_special_charset.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sporadic_master.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_sql_thread_killed_waiting_commit_lock.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_ssl.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_ssl1.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_000001.result
@@ -6510,7 +6246,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_drop_create_temp_table.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_flsh_tbls.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_found_rows.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_ignore.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_insert_delayed.result
@@ -6520,7 +6255,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_log.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_mix_mts_show_relaylog_events.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_mix_rollback_to_savepoint.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_mix_show_relaylog_events.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_mixed_crash_safe.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_mixed_mts_crash_safe.result
@@ -6536,7 +6270,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_until.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_until_pos_middle_gtid.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stm_user_variables.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_stop_slave.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_switch_stm_row_mixed.result
@@ -6545,7 +6278,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_temporal_fractional.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_temporary.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_temporary_error_table_repository.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_temporary_errors.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_test_framework.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_timestamp_upgrage_55.result
@@ -6558,8 +6290,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_typeconv.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_typeconv_innodb.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_udf.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_unknown_ignorable_event.result
-file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_unsafe_statements.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_user.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_user_variables.result
 file path=usr/mysql/5.6/mysql-test/suite/rpl/r/rpl_variables.result
@@ -6580,17 +6310,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter_db.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_alter_repository.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_11932.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_bug33029.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_bug45679.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_avoid_temporal_upgrade.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test
@@ -6633,12 +6358,9 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_concurrency_error.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_conditional_comments.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_connection.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_corruption-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_corruption-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_corruption.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_crash_safe_master.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_crc_check-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_crc_check.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_create_database-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_create_database-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_create_database.test
@@ -6662,22 +6384,17 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_insensitive.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_do_table_filter_sensitive.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_db.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp_gtid.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp_tbl_with_rewrite_db-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_temp_tbl_with_rewrite_db.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_drop_view.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_dual_pos_advance-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_dual_pos_advance.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_dump_thread_kill.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_empty_master_host.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_empty_multi_update.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_err_ignoredtable.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_events.test
@@ -6704,7 +6421,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_free_items-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_free_items.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_function_defaults.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gap_in_retrieved_gtid_set.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_general_log.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_geometry.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_get_lock.test
@@ -6715,12 +6431,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_grant_plugin-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_grant_plugin.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_group_commit_deadlock.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binary_log_as_relay_log.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binlog_errors-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_binlog_errors.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_insensitive.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_do_table_filter_sensitive.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_drop_table.cnf
@@ -6737,22 +6453,17 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_insensitive.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_loaddata_s.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode_off_new_master.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mode_on_new_master.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_parallel.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_purged_maintained.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_replay_relaylog.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_row_event_max_size.test
@@ -6763,11 +6474,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stm_mix_show_relaylog_events.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.cnf
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_stress_failover.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_temp_table.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_transaction_split_across_relay_logs.cnf
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_transaction_split_across_relay_logs.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtid_validate_slave_gtids.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_gtids_restart_slave_io_lost_trx.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
@@ -6788,6 +6494,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_insensitive.test
+file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_filter_sensitive.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ignore_table_update-slave.opt
@@ -6799,7 +6506,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb_bug28430-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
@@ -6853,7 +6559,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_locale.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_log_pos.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_lost_events_on_rotate.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_low_slave_net_time_out.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_manual_change_index_file.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_many_optimize.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_master_connection-master.opt
@@ -6866,8 +6571,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mix_found_rows-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mix_insert_delayed.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mix_missing_data_on_slave.cnf
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mix_missing_data_on_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mixed_bit_pk.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mixed_ddl_dml.test
@@ -6879,16 +6582,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mixed_row_innodb-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_debug-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_debug.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_slave_hang_with_partial_trx.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_mts_stop_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_multi_delete2-slave.opt
@@ -6954,11 +6647,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rbr_to_sbr.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_read_old_relay_log_info.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_read_only.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_empty_sqlthd_pos.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_recovery_replicate_same_server_id.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relay_log_recovery_positions.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -6980,7 +6668,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rewrite_db_filter.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rewrt_db.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rotate_gtid.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rotate_logs.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_rotate_purge_deadlock-master.opt
@@ -7075,7 +6762,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_record_find_myisam.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_reset_slave.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_rollback_to_savepoint.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_sp001.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
@@ -7104,8 +6790,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_view01.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_row_wide_table.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_savepoint.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sbm_previous_gtid_event.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_seconds_behind_master.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync-slave.opt
@@ -7116,18 +6800,12 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_event-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_future_logpos.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_non_group_commit_deadlock.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test
@@ -7153,7 +6831,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_hosts.cnf
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_running.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_show_slave_status_deadlock.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_ddl_errors_cli.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_skip_error-slave.opt
@@ -7181,16 +6858,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_effects.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sp_privileges.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_spec_variables-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_spec_variables.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_special_charset.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sporadic_master.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_sql_thread_killed_waiting_commit_lock.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ssl.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_ssl1.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_000001.test
@@ -7201,8 +6872,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_found_rows.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_ignore-slave.opt
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_ignore.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
@@ -7217,7 +6886,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_log.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_mix_mts_show_relaylog_events.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_mix_rollback_to_savepoint.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_mixed_crash_safe.test
@@ -7240,7 +6908,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_until.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_until_pos_middle_gtid.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stm_user_variables.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_stop_slave.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed-master.opt
@@ -7252,7 +6919,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temporal_fractional.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temporary.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temporary_error_table_repository.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_temporary_errors.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_test_framework.cnf
@@ -7273,8 +6939,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf-slave.opt
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_udf.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_unknown_ignorable_event.test
-file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_unsafe_statements.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_user.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_user_variables.test
 file path=usr/mysql/5.6/mysql-test/suite/rpl/t/rpl_variables.test
@@ -7385,6 +7049,8 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/range_alloc_block_size_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/sort_buffer_size_basic.inc
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/all_vars.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/auto_increment_increment_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/auto_increment_increment_func.result
@@ -7398,7 +7064,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/autocommit_func5.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/automatic_sp_privileges_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/automatic_sp_privileges_func.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/avoid_temporal_upgrade_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/back_log_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/basedir_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/big_tables_basic.result
@@ -7407,9 +7072,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_cache_size_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_checksum_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_direct_non_transactional_updates_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_error_action_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_format_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_gtid_simple_recovery_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_max_flush_queue_time_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_order_commits_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/binlog_row_image_basic.result
@@ -7603,7 +7266,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_monitor_enable_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_monitor_reset_all_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_monitor_reset_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_numa_interleave_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_old_blocks_pct_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_old_blocks_time_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_online_alter_log_max_size_basic.result
@@ -7644,21 +7306,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_table_locks_func.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_thread_concurrency_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_tmpdir_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_trx_purge_view_update_only_debug_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_trx_rseg_n_slots_debug_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_undo_directory_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_undo_logs_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_use_sys_malloc_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_version_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/innodb_write_io_threads_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/insert_id_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/insert_id_func.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/interactive_timeout_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/interactive_timeout_func.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/join_buffer_size_basic_32.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/join_buffer_size_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/keep_files_on_create_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/key_buffer_size_basic.result
@@ -7717,7 +7369,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_connect_errors_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_connections_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_digest_length_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_error_count_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
@@ -7793,7 +7444,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_hosts_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_cond_classes_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_cond_instances_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_digest_length_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_file_classes_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_file_handles_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/pfs_max_file_instances_basic.result
@@ -7881,8 +7531,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sha256_password_public_key_path_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/shared_memory_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/show_old_temporals_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/simplified_binlog_gtid_recovery_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_external_locking_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_name_resolve_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/skip_networking_basic.result
@@ -7945,7 +7593,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/stored_program_cache_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sync_binlog_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sync_frm_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sync_master_info_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sync_relay_log_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/sync_relay_log_info_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/system_time_zone_basic.result
@@ -7966,9 +7613,11 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/timestamp_sysdate_is_now_func.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tmp_table_size_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tmpdir_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_allow_batching_basic.result
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
+file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_isolation_func.result
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
@@ -8000,7 +7649,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/autocommit_func5.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/automatic_sp_privileges_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/automatic_sp_privileges_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/avoid_temporal_upgrade_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/back_log_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/basedir_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/big_tables_basic.test
@@ -8009,9 +7657,7 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_cache_size_basic_64.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_checksum_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_direct_non_transactional_updates_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_error_action_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_format_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_gtid_simple_recovery_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_max_flush_queue_time_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_order_commits_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/binlog_row_image_basic.test
@@ -8115,11 +7761,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/host_cache_size_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/host_cache_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/hostname_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/identity_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/identity_func-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/identity_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/ignore_builtin_innodb_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/ignore_db_dirs_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/init_connect_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/init_file_basic.test
@@ -8135,8 +7776,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_api_enable_mdl_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_api_trx_level_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_autoextend_increment_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_autoinc_lock_mode_func.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_buf_flush_list_now_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_buffer_pool_dump_at_shutdown_basic.test
@@ -8218,7 +7857,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_monitor_enable_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_monitor_reset_all_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_monitor_reset_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_numa_interleave_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_old_blocks_pct_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_old_blocks_time_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_online_alter_log_max_size_basic.test
@@ -8251,30 +7889,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_status_output_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_status_output_locks_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_strict_mode_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_support_xa_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_support_xa_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_sync_array_size_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_sync_spin_loops_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_table_locks_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_table_locks_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_thread_concurrency_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_tmpdir_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_trx_purge_view_update_only_debug_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_trx_rseg_n_slots_debug_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_undo_directory_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_undo_logs_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_use_native_aio_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_use_sys_malloc_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_version_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/insert_id_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/insert_id_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/interactive_timeout_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/interactive_timeout_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/join_buffer_size_basic_32.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/join_buffer_size_basic_64.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/keep_files_on_create_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/key_buffer_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/key_buffer_size_func.test
@@ -8314,28 +7932,10 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_slave_updates_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_slow_slave_statements_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_throttle_queries_not_using_indexes_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_warnings_basic_32.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/log_warnings_basic_64.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/long_query_time_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/low_priority_updates_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/lower_case_file_system_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/lower_case_table_names_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/master_info_repository_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/master_verify_checksum_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_allowed_packet_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_allowed_packet_func.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_cache_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_connect_errors_basic_32.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_connect_errors_basic_64.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_connections_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_digest_length_basic-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_error_count_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
@@ -8427,8 +8027,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_cond_classes_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_cond_instances_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_cond_instances_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_digest_length_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_file_classes_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_file_classes_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/pfs_max_file_handles_basic-master.opt
@@ -8548,8 +8146,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/sha256_password_public_key_path_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/shared_memory_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/show_old_temporals_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/simplified_binlog_gtid_recovery_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_external_locking_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_name_resolve_basic-master.opt
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/skip_name_resolve_basic.test
@@ -8640,34 +8236,6 @@
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/timestamp_sysdate_is_now_func.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tmp_table_size_basic.test
 file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tmpdir_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/transaction_allow_batching_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tx_isolation_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tx_isolation_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/tx_read_only_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/unique_checks_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/version_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/version_comment_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/version_compile_machine_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/version_compile_os_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/wait_timeout_basic.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/wait_timeout_func.test
-file path=usr/mysql/5.6/mysql-test/suite/sys_vars/t/warning_count_basic.test
-file path=usr/mysql/5.6/mysql-test/t/1st.test
-file path=usr/mysql/5.6/mysql-test/t/alias.test
-file path=usr/mysql/5.6/mysql-test/t/almost_full.test
-file path=usr/mysql/5.6/mysql-test/t/alter_table-big.test
-file path=usr/mysql/5.6/mysql-test/t/alter_table.test
-file path=usr/mysql/5.6/mysql-test/t/analyze.test
-file path=usr/mysql/5.6/mysql-test/t/ansi.test
-file path=usr/mysql/5.6/mysql-test/t/archive-big.test
-file path=usr/mysql/5.6/mysql-test/t/archive.test
-file path=usr/mysql/5.6/mysql-test/t/archive_bitfield.test
-file path=usr/mysql/5.6/mysql-test/t/archive_debug.test
 file path=usr/mysql/5.6/mysql-test/t/archive_gis.test
 file path=usr/mysql/5.6/mysql-test/t/archive_no_symlink-master.opt
 file path=usr/mysql/5.6/mysql-test/t/archive_no_symlink.test
@@ -8686,13 +8254,6 @@
 file path=usr/mysql/5.6/mysql-test/t/blackhole.test
 file path=usr/mysql/5.6/mysql-test/t/blackhole_plugin-master.opt
 file path=usr/mysql/5.6/mysql-test/t/blackhole_plugin.test
-file path=usr/mysql/5.6/mysql-test/t/bool.test
-file path=usr/mysql/5.6/mysql-test/t/bootstrap-master.opt
-file path=usr/mysql/5.6/mysql-test/t/bootstrap.test
-file path=usr/mysql/5.6/mysql-test/t/bug12427262.test
-file path=usr/mysql/5.6/mysql-test/t/bug12969156-master.opt
-file path=usr/mysql/5.6/mysql-test/t/bug12969156.test
-file path=usr/mysql/5.6/mysql-test/t/bug17076131-master.opt
 file path=usr/mysql/5.6/mysql-test/t/bug17076131.test
 file path=usr/mysql/5.6/mysql-test/t/bug33509-master.opt
 file path=usr/mysql/5.6/mysql-test/t/bug33509.test
@@ -8731,7 +8292,6 @@
 file path=usr/mysql/5.6/mysql-test/t/concurrent_innodb_unsafelog-master.opt
 file path=usr/mysql/5.6/mysql-test/t/concurrent_innodb_unsafelog.test
 file path=usr/mysql/5.6/mysql-test/t/connect.test
-file path=usr/mysql/5.6/mysql-test/t/connect_debug.test
 file path=usr/mysql/5.6/mysql-test/t/consistent_snapshot.test
 file path=usr/mysql/5.6/mysql-test/t/constraints.test
 file path=usr/mysql/5.6/mysql-test/t/count_distinct.test
@@ -8751,7 +8311,6 @@
 file path=usr/mysql/5.6/mysql-test/t/ctype_collate.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_cp1250_ch.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_cp1251.test
-file path=usr/mysql/5.6/mysql-test/t/ctype_cp932.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_cp932_binlog_row.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_cp932_binlog_stm.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_create.test
@@ -8759,7 +8318,6 @@
 file path=usr/mysql/5.6/mysql-test/t/ctype_eucjpms.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_euckr.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_filename.test
-file path=usr/mysql/5.6/mysql-test/t/ctype_filesystem-master.opt
 file path=usr/mysql/5.6/mysql-test/t/ctype_filesystem.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_gb2312.test
 file path=usr/mysql/5.6/mysql-test/t/ctype_gbk.test
@@ -8827,8 +8385,6 @@
 file path=usr/mysql/5.6/mysql-test/t/ds_mrr-big.test
 file path=usr/mysql/5.6/mysql-test/t/dynamic_tracing.test
 file path=usr/mysql/5.6/mysql-test/t/empty_table.test
-file path=usr/mysql/5.6/mysql-test/t/enable_cleartext_plugin-master.opt
-file path=usr/mysql/5.6/mysql-test/t/enable_cleartext_plugin.test
 file path=usr/mysql/5.6/mysql-test/t/endspace.test
 file path=usr/mysql/5.6/mysql-test/t/eq_range_idx_stat.test
 file path=usr/mysql/5.6/mysql-test/t/error_simulation.test
@@ -8918,8 +8474,6 @@
 file path=usr/mysql/5.6/mysql-test/t/func_sapdb.test
 file path=usr/mysql/5.6/mysql-test/t/func_set.test
 file path=usr/mysql/5.6/mysql-test/t/func_str.test
-file path=usr/mysql/5.6/mysql-test/t/func_str_debug.test
-file path=usr/mysql/5.6/mysql-test/t/func_str_no_ps.test
 file path=usr/mysql/5.6/mysql-test/t/func_system.test
 file path=usr/mysql/5.6/mysql-test/t/func_test.test
 file path=usr/mysql/5.6/mysql-test/t/func_time.test
@@ -9009,8 +8563,6 @@
 file path=usr/mysql/5.6/mysql-test/t/innodb_mysql_sync.test
 file path=usr/mysql/5.6/mysql-test/t/innodb_pk_extension_off.test
 file path=usr/mysql/5.6/mysql-test/t/innodb_pk_extension_on.test
-file path=usr/mysql/5.6/mysql-test/t/innodb_recovery_with_upper_case_names-master.opt
-file path=usr/mysql/5.6/mysql-test/t/innodb_recovery_with_upper_case_names.test
 file path=usr/mysql/5.6/mysql-test/t/insert.test
 file path=usr/mysql/5.6/mysql-test/t/insert_notembedded.test
 file path=usr/mysql/5.6/mysql-test/t/insert_select.test
@@ -9030,7 +8582,6 @@
 file path=usr/mysql/5.6/mysql-test/t/join_nested_bka.test
 file path=usr/mysql/5.6/mysql-test/t/join_nested_bka_nixbnl.test
 file path=usr/mysql/5.6/mysql-test/t/join_outer.test
-file path=usr/mysql/5.6/mysql-test/t/join_outer_bka.test
 file path=usr/mysql/5.6/mysql-test/t/join_outer_bka_nixbnl.test
 file path=usr/mysql/5.6/mysql-test/t/join_outer_innodb.test
 file path=usr/mysql/5.6/mysql-test/t/key.test
@@ -9043,9 +8594,6 @@
 file path=usr/mysql/5.6/mysql-test/t/kill_debug.test
 file path=usr/mysql/5.6/mysql-test/t/limit.test
 file path=usr/mysql/5.6/mysql-test/t/loaddata.test
-file path=usr/mysql/5.6/mysql-test/t/loaddata_autocom_innodb.test
-file path=usr/mysql/5.6/mysql-test/t/loadxml.test
-file path=usr/mysql/5.6/mysql-test/t/locale.test
 file path=usr/mysql/5.6/mysql-test/t/lock.test
 file path=usr/mysql/5.6/mysql-test/t/lock_multi.test
 file path=usr/mysql/5.6/mysql-test/t/lock_multi_bug38499.test
@@ -9054,9 +8602,6 @@
 file path=usr/mysql/5.6/mysql-test/t/lock_sync.test
 file path=usr/mysql/5.6/mysql-test/t/lock_tables_lost_commit-master.opt
 file path=usr/mysql/5.6/mysql-test/t/lock_tables_lost_commit.test
-file path=usr/mysql/5.6/mysql-test/t/log_empty_name.opt
-file path=usr/mysql/5.6/mysql-test/t/log_empty_name.test
-file path=usr/mysql/5.6/mysql-test/t/log_errchk.test
 file path=usr/mysql/5.6/mysql-test/t/log_state-master.opt
 file path=usr/mysql/5.6/mysql-test/t/log_state.test
 file path=usr/mysql/5.6/mysql-test/t/log_state_bug33693-master.opt
@@ -9071,7 +8616,6 @@
 file path=usr/mysql/5.6/mysql-test/t/long_tmpdir-master.sh
 file path=usr/mysql/5.6/mysql-test/t/long_tmpdir.test
 file path=usr/mysql/5.6/mysql-test/t/lowercase_fs_off.test
-file path=usr/mysql/5.6/mysql-test/t/lowercase_fs_on.test
 file path=usr/mysql/5.6/mysql-test/t/lowercase_mixed_tmpdir-master.opt
 file path=usr/mysql/5.6/mysql-test/t/lowercase_mixed_tmpdir-master.sh
 file path=usr/mysql/5.6/mysql-test/t/lowercase_mixed_tmpdir.test
@@ -9081,6 +8625,8 @@
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table-master.opt
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table.test
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table2.test
+file path=usr/mysql/5.6/mysql-test/t/lowercase_table3-master.opt
+file path=usr/mysql/5.6/mysql-test/t/lowercase_table3.test
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table4-master.opt
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table4.test
 file path=usr/mysql/5.6/mysql-test/t/lowercase_table_grant-master.opt
@@ -9099,6 +8645,8 @@
 file path=usr/mysql/5.6/mysql-test/t/merge_innodb.test
 file path=usr/mysql/5.6/mysql-test/t/merge_mmap-master.opt
 file path=usr/mysql/5.6/mysql-test/t/merge_mmap.test
+file path=usr/mysql/5.6/mysql-test/t/merge_recover-master.opt
+file path=usr/mysql/5.6/mysql-test/t/merge_recover.test
 file path=usr/mysql/5.6/mysql-test/t/metadata.test
 file path=usr/mysql/5.6/mysql-test/t/mix2_myisam-master.opt
 file path=usr/mysql/5.6/mysql-test/t/mix2_myisam.test
@@ -9107,9 +8655,6 @@
 file path=usr/mysql/5.6/mysql-test/t/multi_plugin_load.test
 file path=usr/mysql/5.6/mysql-test/t/multi_plugin_load_add-master.opt
 file path=usr/mysql/5.6/mysql-test/t/multi_plugin_load_add.test
-file path=usr/mysql/5.6/mysql-test/t/multi_plugin_load_add2-master.opt
-file path=usr/mysql/5.6/mysql-test/t/multi_plugin_load_add2.test
-file path=usr/mysql/5.6/mysql-test/t/multi_statement-master.opt
 file path=usr/mysql/5.6/mysql-test/t/multi_statement.test
 file path=usr/mysql/5.6/mysql-test/t/multi_update-master.opt
 file path=usr/mysql/5.6/mysql-test/t/multi_update.test
@@ -9139,8 +8684,6 @@
 file path=usr/mysql/5.6/mysql-test/t/myisam_mrr_cost_icp.test
 file path=usr/mysql/5.6/mysql-test/t/myisam_mrr_icp.test
 file path=usr/mysql/5.6/mysql-test/t/myisam_mrr_none.test
-file path=usr/mysql/5.6/mysql-test/t/myisam_recover-master.opt
-file path=usr/mysql/5.6/mysql-test/t/myisam_recover.test
 file path=usr/mysql/5.6/mysql-test/t/myisam_row_rpl-master.opt
 file path=usr/mysql/5.6/mysql-test/t/myisam_row_rpl-slave.opt
 file path=usr/mysql/5.6/mysql-test/t/myisam_row_rpl.test
@@ -9174,7 +8717,6 @@
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog-master.opt
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_debug.test
-file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_mixed_or_statment.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_raw_mode.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_raw_mode_win.test
 file path=usr/mysql/5.6/mysql-test/t/mysqlbinlog_row_big.test
@@ -9456,7 +8998,6 @@
 file path=usr/mysql/5.6/mysql-test/t/status.test
 file path=usr/mysql/5.6/mysql-test/t/status2.test
 file path=usr/mysql/5.6/mysql-test/t/status_bug17954.test
-file path=usr/mysql/5.6/mysql-test/t/status_debug.test
 file path=usr/mysql/5.6/mysql-test/t/strict-master.opt
 file path=usr/mysql/5.6/mysql-test/t/strict.test
 file path=usr/mysql/5.6/mysql-test/t/strict_autoinc_1myisam.test
@@ -9490,8 +9031,6 @@
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_dupsweed_bka_nixbnl.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_dupsweed_bkaunique-master.opt
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_dupsweed_bkaunique.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_firstmatch-master.opt
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_firstmatch.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_firstmatch_bka-master.opt
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_firstmatch_bka.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_firstmatch_bka_nixbnl.test
@@ -9502,18 +9041,6 @@
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_innodb_all_bkaunique.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_innodb_none.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_innodb_none_bka.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_innodb_none_bka_nixbnl.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_innodb_none_bkaunique.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_loosescan.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_loosescan_bka.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_loosescan_bka_nixbnl.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_loosescan_bkaunique.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_mat.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_mat_bka.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_mat_bka_nixbnl.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_mat_bkaunique.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_mat_nosj.test
-file path=usr/mysql/5.6/mysql-test/t/subquery_sj_none.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_none_bka.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_none_bka_nixbnl.test
 file path=usr/mysql/5.6/mysql-test/t/subquery_sj_none_bkaunique.test
@@ -9542,8 +9069,6 @@
 file path=usr/mysql/5.6/mysql-test/t/table_open_cache_functionality.test
 file path=usr/mysql/5.6/mysql-test/t/tablelock.test
 file path=usr/mysql/5.6/mysql-test/t/tablespace.test
-file path=usr/mysql/5.6/mysql-test/t/temp_pool-master.opt
-file path=usr/mysql/5.6/mysql-test/t/temp_pool.test
 file path=usr/mysql/5.6/mysql-test/t/temp_table-master.opt
 file path=usr/mysql/5.6/mysql-test/t/temp_table.test
 file path=usr/mysql/5.6/mysql-test/t/temporal_literal.test
@@ -9722,6 +9247,4 @@
 # added dependency on mysql-56
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/mysql/5.6/bin/mysql
 depend type=require \
-    fmri=database/mysql-56/library@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-depend type=require \
     fmri=database/mysql-56@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
upstream/oracle/userland-gate