Move mysql-test-run/extra/rpl_tests to suite/rpl/include

Renamed suite/rpl/include/rpl_sync.inc to rpl_sync_test.inc to remove clash with include/rpl_sync.inc
2018-03-09 15:14:33 +02:00 · 2018-03-09 15:14:33 +02:00 · 39018f2a5a
commit 39018f2a5a
parent 108ed22854
290 changed files with 891 additions and 890 deletions
--- a/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
+++ b/mysql-test/extra/rpl_tests/rpl_show_log_events_with_varying_options.inc
@ -1,11 +0,0 @@
-# Include file for rpl_show_log_events.inc 
-
--let $binlog_limit=
--source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit= 2
--source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit= 2,4
--source extra/rpl_tests/rpl_show_binlog_events.inc
--let $binlog_limit=
--let $binlog_file=
--source extra/rpl_tests/rpl_show_binlog_events.inc 
--- a/mysql-test/include/rpl_row_img_general_loop.inc
+++ b/mysql-test/include/rpl_row_img_general_loop.inc
@ -12,7 +12,7 @@
 #    the name of the test script to include in every combination
 #
 # Sample usage:
-#   -- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test
+#   -- let $row_img_test_script= suite/rpl/include/rpl_row_img.test
 #   -- source include/rpl_row_img_general_loop.test


--- a/mysql-test/include/show_delayed_slave_state.inc
+++ b/mysql-test/include/show_delayed_slave_state.inc
@ -5,7 +5,7 @@
 # ==== Usage ====
 #
 # --let $verbose_delayed_slave_state= [0|1]
-# --source extra/rpl_tests/show_delayed_slave_state.inc
+# --source suite/rpl/include/show_delayed_slave_state.inc
 #
 # By default, the output is normalized so that it does not depend on
 # exact timing or exact binlog positions. If
--- a/mysql-test/suite/binlog/t/binlog_unsafe.test
+++ b/mysql-test/suite/binlog/t/binlog_unsafe.test
@ -261,7 +261,7 @@ while ($unsafe_type < 9) {
    --let $CRC_ARG_sel_sidef= $sel_sidef_0
    --let $CRC_ARG_sel_retval= $sel_retval_0
    --let $CRC_ARG_desc= $desc_0
-    --source extra/rpl_tests/create_recursive_construct.inc
+    --source suite/rpl/include/create_recursive_construct.inc
    --let $stmt_sidef_1= $CRC_RET_stmt_sidef
    --let $value_1= $CRC_RET_value
    --let $sel_sidef_1= $CRC_RET_sel_sidef
@ -292,7 +292,7 @@ while ($unsafe_type < 9) {
        --let $CRC_ARG_sel_sidef= $sel_sidef_1
        --let $CRC_ARG_sel_retval= $sel_retval_1
        --let $CRC_ARG_desc= $desc_1
-        --source extra/rpl_tests/create_recursive_construct.inc
+        --source suite/rpl/include/create_recursive_construct.inc
        --let $stmt_sidef_2= $CRC_RET_stmt_sidef
        --let $value_2= $CRC_RET_value
        --let $sel_sidef_2= $CRC_RET_sel_sidef
@ -321,7 +321,7 @@ while ($unsafe_type < 9) {
            --let $CRC_ARG_sel_sidef= $sel_sidef_2
            --let $CRC_ARG_sel_retval= $sel_retval_2
            --let $CRC_ARG_desc= $desc_2
-            --source extra/rpl_tests/create_recursive_construct.inc
+            --source suite/rpl/include/create_recursive_construct.inc

            # Drop created object.
            if ($drop_3) {
--- a/mysql-test/suite/binlog_encryption/multisource.test
+++ b/mysql-test/suite/binlog_encryption/multisource.test
@ -1 +1 @@
--source extra/rpl_tests/multisource.inc
+--source suite/rpl/include/multisource.inc
--- a/mysql-test/suite/binlog_encryption/rpl_binlog_errors.test
+++ b/mysql-test/suite/binlog_encryption/rpl_binlog_errors.test
@ -1,2 +1,2 @@
 --let $binlog_limit= 5,1
--source extra/rpl_tests/rpl_binlog_errors.inc
+--source suite/rpl/include/rpl_binlog_errors.inc
--- a/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.test
+++ b/mysql-test/suite/binlog_encryption/rpl_cant_read_event_incident.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_cant_read_event_incident.inc
+--source suite/rpl/include/rpl_cant_read_event_incident.inc
--- a/mysql-test/suite/binlog_encryption/rpl_checksum.test
+++ b/mysql-test/suite/binlog_encryption/rpl_checksum.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_checksum.inc
+--source suite/rpl/include/rpl_checksum.inc
--- a/mysql-test/suite/binlog_encryption/rpl_checksum_cache.test
+++ b/mysql-test/suite/binlog_encryption/rpl_checksum_cache.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_checksum_cache.inc
+--source suite/rpl/include/rpl_checksum_cache.inc
--- a/mysql-test/suite/binlog_encryption/rpl_corruption.test
+++ b/mysql-test/suite/binlog_encryption/rpl_corruption.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_corruption.inc
+--source suite/rpl/include/rpl_corruption.inc
--- a/mysql-test/suite/binlog_encryption/rpl_gtid_basic.test
+++ b/mysql-test/suite/binlog_encryption/rpl_gtid_basic.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_gtid_basic.inc
+--source suite/rpl/include/rpl_gtid_basic.inc
--- a/mysql-test/suite/binlog_encryption/rpl_incident.test
+++ b/mysql-test/suite/binlog_encryption/rpl_incident.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_incident.inc
+--source suite/rpl/include/rpl_incident.inc
--- a/mysql-test/suite/binlog_encryption/rpl_init_slave_errors.test
+++ b/mysql-test/suite/binlog_encryption/rpl_init_slave_errors.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_init_slave_errors.inc
+--source suite/rpl/include/rpl_init_slave_errors.inc
--- a/mysql-test/suite/binlog_encryption/rpl_loaddata_local.test
+++ b/mysql-test/suite/binlog_encryption/rpl_loaddata_local.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_loaddata_local.inc
+--source suite/rpl/include/rpl_loaddata_local.inc
--- a/mysql-test/suite/binlog_encryption/rpl_loadfile.test
+++ b/mysql-test/suite/binlog_encryption/rpl_loadfile.test
@ -1,4 +1,4 @@
--source extra/rpl_tests/rpl_loadfile.inc
+--source suite/rpl/include/rpl_loadfile.inc

 --let $datadir= `SELECT @@datadir`

--- a/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/binlog_encryption/rpl_mixed_binlog_max_cache_size.test
@ -3,5 +3,5 @@
 --source include/not_windows.inc
 --source include/have_binlog_format_mixed.inc

--source extra/rpl_tests/rpl_binlog_max_cache_size.test
+--source suite/rpl/include/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/binlog_encryption/rpl_packet.test
+++ b/mysql-test/suite/binlog_encryption/rpl_packet.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_packet.inc
+--source suite/rpl/include/rpl_packet.inc
--- a/mysql-test/suite/binlog_encryption/rpl_parallel.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_parallel.inc
+--source suite/rpl/include/rpl_parallel.inc
--- a/mysql-test/suite/binlog_encryption/rpl_parallel_show_binlog_events_purge_logs.test
+++ b/mysql-test/suite/binlog_encryption/rpl_parallel_show_binlog_events_purge_logs.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc
+--source suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc
--- a/mysql-test/suite/binlog_encryption/rpl_relayrotate.test
+++ b/mysql-test/suite/binlog_encryption/rpl_relayrotate.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_relayrotate.inc
+--source suite/rpl/include/rpl_relayrotate.inc
--- a/mysql-test/suite/binlog_encryption/rpl_semi_sync.test
+++ b/mysql-test/suite/binlog_encryption/rpl_semi_sync.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_semi_sync.inc
+--source suite/rpl/include/rpl_semi_sync.inc
--- a/mysql-test/suite/binlog_encryption/rpl_skip_replication.test
+++ b/mysql-test/suite/binlog_encryption/rpl_skip_replication.test
@ -1,2 +1,2 @@
 --let $use_remote_mysqlbinlog= 1
--source extra/rpl_tests/rpl_skip_replication.inc
+--source suite/rpl/include/rpl_skip_replication.inc
--- a/mysql-test/suite/binlog_encryption/rpl_special_charset.test
+++ b/mysql-test/suite/binlog_encryption/rpl_special_charset.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_special_charset.inc
+--source suite/rpl/include/rpl_special_charset.inc
--- a/mysql-test/suite/binlog_encryption/rpl_sporadic_master.test
+++ b/mysql-test/suite/binlog_encryption/rpl_sporadic_master.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_sporadic_master.inc
+--source suite/rpl/include/rpl_sporadic_master.inc
--- a/mysql-test/suite/binlog_encryption/rpl_ssl.test
+++ b/mysql-test/suite/binlog_encryption/rpl_ssl.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_ssl.inc
+--source suite/rpl/include/rpl_ssl.inc
--- a/mysql-test/suite/binlog_encryption/rpl_stm_relay_ign_space.test
+++ b/mysql-test/suite/binlog_encryption/rpl_stm_relay_ign_space.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_stm_relay_ign_space.inc
+--source suite/rpl/include/rpl_stm_relay_ign_space.inc
--- a/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.test
+++ b/mysql-test/suite/binlog_encryption/rpl_switch_stm_row_mixed.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_switch_stm_row_mixed.inc
+--source suite/rpl/include/rpl_switch_stm_row_mixed.inc
--- a/mysql-test/suite/binlog_encryption/rpl_sync.test
+++ b/mysql-test/suite/binlog_encryption/rpl_sync.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_sync.inc
+--source suite/rpl/include/rpl_sync_test.inc
--- a/mysql-test/suite/binlog_encryption/rpl_temporal_format_default_to_default.test
+++ b/mysql-test/suite/binlog_encryption/rpl_temporal_format_default_to_default.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
--- a/mysql-test/suite/binlog_encryption/rpl_temporal_format_mariadb53_to_mysql56.test
+++ b/mysql-test/suite/binlog_encryption/rpl_temporal_format_mariadb53_to_mysql56.test
@ -3,4 +3,4 @@
 --let $force_master_mysql56_temporal_format=false;
 --let $force_slave_mysql56_temporal_format=true;

--source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
--- a/mysql-test/suite/binlog_encryption/rpl_temporal_format_mysql56_to_mariadb53.test
+++ b/mysql-test/suite/binlog_encryption/rpl_temporal_format_mysql56_to_mariadb53.test
@ -1,4 +1,4 @@
 --let $force_master_mysql56_temporal_format=true;
 --let $force_slave_mysql56_temporal_format=false;

--source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source suite/rpl/include/rpl_temporal_format_default_to_default.inc
--- a/mysql-test/suite/binlog_encryption/rpl_typeconv.test
+++ b/mysql-test/suite/binlog_encryption/rpl_typeconv.test
@ -1 +1 @@
--source extra/rpl_tests/rpl_typeconv.inc
+--source suite/rpl/include/rpl_typeconv.inc
--- a/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_row_max_relay_size.test
@ -6,4 +6,4 @@
 # Requires statement logging
 source include/have_binlog_format_row.inc;

-source extra/rpl_tests/rpl_max_relay_size.test;
+source suite/rpl/include/rpl_max_relay_size.test;
--- a/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_row_reset_slave.test
@ -1,5 +1,5 @@
 # TBF - difference in row level logging
 # Temp tables are not replicated in rbr, but it is still good to hit rbr with everthing
 -- source include/have_binlog_format_row.inc
-- source extra/rpl_tests/rpl_reset_slave.test
+-- source suite/rpl/include/rpl_reset_slave.test

--- a/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_stm_max_relay_size.test
@ -5,7 +5,7 @@

 # Requires statement logging
 -- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/rpl_tests/rpl_max_relay_size.test
+-- source suite/rpl/include/rpl_max_relay_size.test

 # End of 4.1 tests
 # 
--- a/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
+++ b/mysql-test/suite/engines/funcs/t/rpl_stm_reset_slave.test
@ -1,6 +1,6 @@
 # TBF - difference in row level logging
 -- source include/have_binlog_format_mixed_or_statement.inc
-- source extra/rpl_tests/rpl_reset_slave.test
+-- source suite/rpl/include/rpl_reset_slave.test

 # End of 4.1 tests
 #
--- a/mysql-test/suite/multi_source/multisource.test
+++ b/mysql-test/suite/multi_source/multisource.test
@ -1 +1 @@
--source extra/rpl_tests/multisource.inc
+--source suite/rpl/include/multisource.inc
--- a/mysql-test/suite/rpl/include/check_type.inc
+++ b/mysql-test/suite/rpl/include/check_type.inc
--- a/mysql-test/suite/rpl/include/create_recursive_construct.inc
+++ b/mysql-test/suite/rpl/include/create_recursive_construct.inc
@ -49,7 +49,7 @@
 # let $CRC_ARG_sel_retval= <stmt>;
 # let $CRC_ARG_sel_sidef= <stmt>;
 # let $CRC_ARG_desc= <desc>;
-# source extra/rpl_tests/create_recursive_construct.inc;
+# source suite/rpl/include/create_recursive_construct.inc;
 # let $my_stmt_sidef= $CRC_RET_stmt_sidef;
 # let $my_value= $CRC_RET_value;
 # let $my_sel_sidef= $CRC_RET_sel_sidef;
--- a/mysql-test/suite/rpl/include/delayed_slave_wait_on_query.inc
+++ b/mysql-test/suite/rpl/include/delayed_slave_wait_on_query.inc
@ -14,7 +14,7 @@
 # ==== Usage ====
 #
 # --let $query_number= 4
-# --source extra/rpl_tests/delayed_slave_wait_on_query.inc
+# --source suite/rpl/include/delayed_slave_wait_on_query.inc
 #
 # Parameters:
 # $query_number
--- a/mysql-test/suite/rpl/include/multisource.inc
+++ b/mysql-test/suite/rpl/include/multisource.inc
@ -4,7 +4,7 @@
 # Please check all dependent tests after modifying it
 #
 # Usage:
-# --source extra/rpl_tests/multisource.inc
+# --source suite/rpl/include/multisource.inc
 #
 # By default, the script expects the length of the 2nd binary log to be
 # $binlog_start_pos + length(Gtid_list event) + 2 x length(Binlog_checkpoint event)
--- a/mysql-test/suite/rpl/include/rpl_EE_err.test
+++ b/mysql-test/suite/rpl/include/rpl_EE_err.test
--- a/mysql-test/suite/rpl/include/rpl_auto_increment.test
+++ b/mysql-test/suite/rpl/include/rpl_auto_increment.test
--- a/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test
+++ b/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test
--- a/mysql-test/suite/rpl/include/rpl_auto_increment_invoke_trigger.test
+++ b/mysql-test/suite/rpl/include/rpl_auto_increment_invoke_trigger.test
--- a/mysql-test/suite/rpl/include/rpl_autoinc_func_invokes_trigger.test
+++ b/mysql-test/suite/rpl/include/rpl_autoinc_func_invokes_trigger.test
--- a/mysql-test/suite/rpl/include/rpl_binlog_errors.inc
+++ b/mysql-test/suite/rpl/include/rpl_binlog_errors.inc
--- a/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test
--- a/mysql-test/suite/rpl/include/rpl_blackhole.test
+++ b/mysql-test/suite/rpl/include/rpl_blackhole.test
--- a/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc
+++ b/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc
--- a/mysql-test/suite/rpl/include/rpl_charset.test
+++ b/mysql-test/suite/rpl/include/rpl_charset.test
--- a/mysql-test/suite/rpl/include/rpl_checksum.inc
+++ b/mysql-test/suite/rpl/include/rpl_checksum.inc
--- a/mysql-test/suite/rpl/include/rpl_checksum_cache.inc
+++ b/mysql-test/suite/rpl/include/rpl_checksum_cache.inc
--- a/mysql-test/suite/rpl/include/rpl_commit_after_flush.test
+++ b/mysql-test/suite/rpl/include/rpl_commit_after_flush.test
--- a/mysql-test/suite/rpl/include/rpl_conflicts.test
+++ b/mysql-test/suite/rpl/include/rpl_conflicts.test
--- a/mysql-test/suite/rpl/include/rpl_corruption.inc
+++ b/mysql-test/suite/rpl/include/rpl_corruption.inc
--- a/mysql-test/suite/rpl/include/rpl_ddl.test
+++ b/mysql-test/suite/rpl/include/rpl_ddl.test
@ -1,4 +1,4 @@
-################# extra/rpl_tests/rpl_ddl.test ########################
+################# suite/rpl/include/rpl_ddl.test ########################
 #                                                                     #
 # DDL statements (sometimes with implicit COMMIT) and other stuff     #
 # executed on the master and it's propagation into the slave.         #
--- a/mysql-test/suite/rpl/include/rpl_deadlock.test
+++ b/mysql-test/suite/rpl/include/rpl_deadlock.test
--- a/mysql-test/suite/rpl/include/rpl_delete_no_where.test
+++ b/mysql-test/suite/rpl/include/rpl_delete_no_where.test
--- a/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.inc
+++ b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.inc
--- a/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test
+++ b/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test
@ -64,7 +64,7 @@
 #
 #
 # This test uses the commands available at:
-#   extra/rpl_tests/rpl_drop_create_temp_table.inc
+#   suite/rpl/include/rpl_drop_create_temp_table.inc
 #
 ###############################################################################

@ -77,7 +77,7 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state

 --let $tot_table= 2
 SET @commands= 'configure';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo #########################################################################
 --echo #           1 - Tables dropped by "DROP TEMPORARY TABLE"
@ -89,195 +89,195 @@ connection master;
 --echo #1) Generates in the binlog what follows:
 --echo #
 SET @commands= 'Drop-Temp-T-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-N-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-Xe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-If-Xe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-TXe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-If-TXe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-NXe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-If-NXe-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-TN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-TT-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-NN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo #
 --echo #2) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B T Drop-Temp-T-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-T-Temp N Drop-Temp-T-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-N-Temp N Drop-Temp-N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-Xe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-Xe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-TXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-NXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TN-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TT-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo #
 --echo #3) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B T Drop-Temp-T-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-T-Temp N Drop-Temp-T-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-N-Temp N Drop-Temp-N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-Xe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-Xe-Temp N Drop-Temp-Xe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-Xe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-Xe-Temp N Drop-Temp-If-Xe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-TXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-TXe-Temp N Drop-Temp-If-TXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-NXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-If-NXe-Temp N Drop-Temp-If-NXe-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TN-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TT-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Ne R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp Te R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp NeT-trig R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo #########################################################################
 --echo #                   2 - Tables dropped by "DROP TABLE"
@ -289,86 +289,86 @@ connection master;
 --echo #1) Generates in the binlog what follows:
 --echo #
 SET @commands= 'Drop-T';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-N';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Xe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-If-Xe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-TXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-If-TXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-NXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-If-NXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-TN';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-TT';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-NN';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-N-TN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-TN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo #
 --echo #2) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B T Drop-T';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-N';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-Xe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-If-Xe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-TXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-If-TXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-NXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-If-NXe';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-TN';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-TT';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-NN';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-N-TN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B T Drop-TN-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo #########################################################################
 --echo #                      3 - CREATE TEMPORARY TABLE
@ -380,48 +380,48 @@ connection master;
 --echo #1) Generates in the binlog what follows:
 --echo #
 SET @commands= 'Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo #
 --echo #2) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo #
 --echo #3) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Ne R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp Te R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp NeT-trig R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo #########################################################################
 --echo #                     4 -  CHANGING TEMPORARY TABLES
@ -433,25 +433,25 @@ connection master;
 --echo #1) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B N N-Temp N-SELECT-N-Temp N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-N-Temp N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig C';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo
 --echo
@ -459,25 +459,25 @@ SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig C';
 --echo #2) Generates in the binlog what follows:
 --echo #
 SET @commands= 'B N N-Temp N-SELECT-N-Temp N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-N-Temp N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Ne R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp Te R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 SET @commands= 'B N N-Temp T-SELECT-T-Temp N-Temp NeT-trig R';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc

 --echo ###################################################################################
 --echo #                               CHECK CONSISTENCY
@ -499,4 +499,4 @@ if (`select @@session.binlog_format != 'STATEMENT'`)
 --echo #                           CLEAN
 --echo #########################################################################
 SET @commands= 'clean';
--source extra/rpl_tests/rpl_drop_create_temp_table.inc
+--source suite/rpl/include/rpl_drop_create_temp_table.inc
--- a/mysql-test/suite/rpl/include/rpl_extra_col_master.test
+++ b/mysql-test/suite/rpl/include/rpl_extra_col_master.test
--- a/mysql-test/suite/rpl/include/rpl_extra_col_slave.test
+++ b/mysql-test/suite/rpl/include/rpl_extra_col_slave.test
--- a/mysql-test/suite/rpl/include/rpl_failed_optimize.test
+++ b/mysql-test/suite/rpl/include/rpl_failed_optimize.test
--- a/mysql-test/suite/rpl/include/rpl_flsh_tbls.test
+++ b/mysql-test/suite/rpl/include/rpl_flsh_tbls.test
--- a/mysql-test/suite/rpl/include/rpl_foreign_key.test
+++ b/mysql-test/suite/rpl/include/rpl_foreign_key.test
--- a/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test
--- a/mysql-test/suite/rpl/include/rpl_gtid_basic.inc
+++ b/mysql-test/suite/rpl/include/rpl_gtid_basic.inc
--- a/mysql-test/suite/rpl/include/rpl_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/include/rpl_implicit_commit_binlog.test
--- a/mysql-test/suite/rpl/include/rpl_incident.inc
+++ b/mysql-test/suite/rpl/include/rpl_incident.inc
--- a/mysql-test/suite/rpl/include/rpl_init_slave_errors.inc
+++ b/mysql-test/suite/rpl/include/rpl_init_slave_errors.inc
--- a/mysql-test/suite/rpl/include/rpl_innodb.test
+++ b/mysql-test/suite/rpl/include/rpl_innodb.test
--- a/mysql-test/suite/rpl/include/rpl_insert_delayed.test
+++ b/mysql-test/suite/rpl/include/rpl_insert_delayed.test
--- a/mysql-test/suite/rpl/include/rpl_insert_id.test
+++ b/mysql-test/suite/rpl/include/rpl_insert_id.test
--- a/mysql-test/suite/rpl/include/rpl_insert_id_pk.test
+++ b/mysql-test/suite/rpl/include/rpl_insert_id_pk.test
--- a/mysql-test/suite/rpl/include/rpl_insert_ignore.test
+++ b/mysql-test/suite/rpl/include/rpl_insert_ignore.test
--- a/mysql-test/suite/rpl/include/rpl_loaddata.test
+++ b/mysql-test/suite/rpl/include/rpl_loaddata.test
--- a/mysql-test/suite/rpl/include/rpl_loaddata_local.inc
+++ b/mysql-test/suite/rpl/include/rpl_loaddata_local.inc
--- a/mysql-test/suite/rpl/include/rpl_loadfile.inc
+++ b/mysql-test/suite/rpl/include/rpl_loadfile.inc
@ -18,7 +18,7 @@
 -- source include/have_binlog_format_mixed_or_row.inc
 -- source include/master-slave.inc

-- source extra/rpl_tests/rpl_loadfile.test
+-- source suite/rpl/include/rpl_loadfile.test

 #  BUG#39701: Mixed binlog format does not switch to row mode on LOAD_FILE
 #
--- a/mysql-test/suite/rpl/include/rpl_loadfile.test
+++ b/mysql-test/suite/rpl/include/rpl_loadfile.test
--- a/mysql-test/suite/rpl/include/rpl_log.test
+++ b/mysql-test/suite/rpl/include/rpl_log.test
--- a/mysql-test/suite/rpl/include/rpl_max_relay_size.test
+++ b/mysql-test/suite/rpl/include/rpl_max_relay_size.test
--- a/mysql-test/suite/rpl/include/rpl_mixing_engines.inc
+++ b/mysql-test/suite/rpl/include/rpl_mixing_engines.inc
--- a/mysql-test/suite/rpl/include/rpl_mixing_engines.test
+++ b/mysql-test/suite/rpl/include/rpl_mixing_engines.test
--- a/mysql-test/suite/rpl/include/rpl_multi_query.test
+++ b/mysql-test/suite/rpl/include/rpl_multi_query.test
--- a/mysql-test/suite/rpl/include/rpl_multi_update.test
+++ b/mysql-test/suite/rpl/include/rpl_multi_update.test
--- a/mysql-test/suite/rpl/include/rpl_multi_update2.test
+++ b/mysql-test/suite/rpl/include/rpl_multi_update2.test
--- a/mysql-test/suite/rpl/include/rpl_multi_update3.test
+++ b/mysql-test/suite/rpl/include/rpl_multi_update3.test
--- a/mysql-test/suite/rpl/include/rpl_not_null.test
+++ b/mysql-test/suite/rpl/include/rpl_not_null.test
--- a/mysql-test/suite/rpl/include/rpl_packet.inc
+++ b/mysql-test/suite/rpl/include/rpl_packet.inc
--- a/mysql-test/suite/rpl/include/rpl_parallel.inc
+++ b/mysql-test/suite/rpl/include/rpl_parallel.inc
--- a/mysql-test/suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc
+++ b/mysql-test/suite/rpl/include/rpl_parallel_show_binlog_events_purge_logs.inc
--- a/mysql-test/suite/rpl/include/rpl_partition.test
+++ b/mysql-test/suite/rpl/include/rpl_partition.test
--- a/mysql-test/suite/rpl/include/rpl_record_compare.test
+++ b/mysql-test/suite/rpl/include/rpl_record_compare.test
--- a/mysql-test/suite/rpl/include/rpl_relayrotate.inc
+++ b/mysql-test/suite/rpl/include/rpl_relayrotate.inc
@ -14,5 +14,5 @@
 -- source include/master-slave.inc

 let $engine_type=innodb;
-- source extra/rpl_tests/rpl_relayrotate.test
+-- source suite/rpl/include/rpl_relayrotate.test
 --source include/rpl_end.inc
--- a/mysql-test/suite/rpl/include/rpl_relayrotate.test
+++ b/mysql-test/suite/rpl/include/rpl_relayrotate.test
--- a/mysql-test/suite/rpl/include/rpl_reset_slave.test
+++ b/mysql-test/suite/rpl/include/rpl_reset_slave.test
--- a/mysql-test/suite/rpl/include/rpl_row_001.test
+++ b/mysql-test/suite/rpl/include/rpl_row_001.test
--- a/mysql-test/suite/rpl/include/rpl_row_UUID.test
+++ b/mysql-test/suite/rpl/include/rpl_row_UUID.test
--- a/mysql-test/suite/rpl/include/rpl_row_annotate.test
+++ b/mysql-test/suite/rpl/include/rpl_row_annotate.test
--- a/Show More
+++ b/Show More