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

118 files changed, 171 insertions, 171 deletions

diff --git a/mysql-test/suite/rpl/t/rpl_EE_err.test b/mysql-test/suite/rpl/t/rpl_EE_err.test
index 28c5af0a192..b2ca3aacb58 100644
--- a/mysql-test/suite/rpl/t/rpl_EE_err.test
+++ b/mysql-test/suite/rpl/t/rpl_EE_err.test
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_EE_err.test
+-- source include/rpl_EE_err.test
diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment.test b/mysql-test/suite/rpl/t/rpl_auto_increment.test
index fe0f1689471..6d01fdb8796 100644
--- a/mysql-test/suite/rpl/t/rpl_auto_increment.test
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment.test
@@ -4,4 +4,4 @@
 -- source include/have_innodb.inc
 let $engine_type=innodb;
 let $engine_type2=myisam;
--- source extra/rpl_tests/rpl_auto_increment.test
+-- source include/rpl_auto_increment.test
diff --git a/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test b/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
index b5eb3c5408a..82db8f08c90 100644
--- a/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
+++ b/mysql-test/suite/rpl/t/rpl_auto_increment_update_failure.test
@@ -21,43 +21,43 @@ source include/master-slave.inc;
 
 --echo # Test case1: INVOKES A TRIGGER with after insert action
 let $trigger_action = after insert;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case2: INVOKES A TRIGGER with before insert action
 let $trigger_action = before insert;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case3: INVOKES A TRIGGER with after update action
 let $trigger_action = after update;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case4: INVOKES A TRIGGER with before update action
 let $trigger_action = before update;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case5: INVOKES A TRIGGER with after delete action
 let $trigger_action = after delete;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case6: INVOKES A TRIGGER with before delete action
 let $trigger_action = before delete;
-source extra/rpl_tests/rpl_auto_increment_invoke_trigger.test;
+source include/rpl_auto_increment_invoke_trigger.test;
 
 --echo # Test case7: CALLS A FUNCTION which INVOKES A TRIGGER with after insert action
 let $insert_action = after insert;
-source extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test;
+source include/rpl_autoinc_func_invokes_trigger.test;
 
 --echo # Test case8: CALLS A FUNCTION which INVOKES A TRIGGER with before insert action
 let $insert_action = before insert;
-source extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test;
+source include/rpl_autoinc_func_invokes_trigger.test;
 
 --echo # Test case9: INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS with after insert action
 let $insert_action = after insert;
-source extra/rpl_tests/rpl_auto_increment_insert_view.test;
+source include/rpl_auto_increment_insert_view.test;
 
 --echo # Test case10: INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS with before insert action
 let $insert_action = before insert;
-source extra/rpl_tests/rpl_auto_increment_insert_view.test;
+source include/rpl_auto_increment_insert_view.test;
 
 --echo # Test case11: INVOKES A FUNCTION TO INSERT TWO OR MORE VALUES INTO A TABLE WITH AUTOINC COLUMN
 connection master;
diff --git a/mysql-test/suite/rpl/t/rpl_binlog_errors.test b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
index 6a2cf20d756..30faaf79613 100644
--- a/mysql-test/suite/rpl/t/rpl_binlog_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_binlog_errors.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_binlog_errors.inc
+--source include/rpl_binlog_errors.inc
diff --git a/mysql-test/suite/rpl/t/rpl_blackhole.test b/mysql-test/suite/rpl/t/rpl_blackhole.test
index 76b2e2421c9..120f11f58ea 100644
--- a/mysql-test/suite/rpl/t/rpl_blackhole.test
+++ b/mysql-test/suite/rpl/t/rpl_blackhole.test
@@ -33,19 +33,19 @@ sync_slave_with_master;
 
 # Test insert, no primary key
 let $statement = INSERT INTO t1 VALUES (1,1,1),(2,1,2),(3,1,3),(4,1,4);
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test update, no primary key
 let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 1;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test delete, no primary key
 let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 1;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test INSERT-SELECT into Blackhole, no primary key
 let $statement = INSERT INTO t1 SELECT * FROM t2;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # 
 # The MASTER has MyISAM as the engine for both tables. The SLAVE has Blackhole
@@ -62,7 +62,7 @@ source extra/rpl_tests/rpl_blackhole.test;
 #
 # Test INSERT-SELECT from Blackhole, no primary key
 # let $statement = INSERT INTO t2 SELECT * FROM t1;
-# source extra/rpl_tests/rpl_blackhole.test;
+# source include/rpl_blackhole.test;
 #
 
 connection master;
@@ -70,30 +70,30 @@ ALTER TABLE t1 ADD PRIMARY KEY pk_t1 (a,b);
 
 # Test insert, primary key
 let $statement = INSERT INTO t1 VALUES (1,2,1),(2,2,2),(3,2,3),(4,2,4);
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test update, primary key
 let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 2;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test delete, primary key
 let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 2;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 connection master;
 ALTER TABLE t1 DROP PRIMARY KEY, ADD KEY key_t1 (a);
 
 # Test insert, key
 let $statement = INSERT INTO t1 VALUES (1,3,1),(2,3,2),(3,3,3),(4,3,4);
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test update, key
 let $statement = UPDATE t1 SET c = 2*c WHERE a % 2 = 0 AND b = 3;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 # Test delete, key
 let $statement = DELETE FROM t1 WHERE a % 2 = 0 AND b = 3;
-source extra/rpl_tests/rpl_blackhole.test;
+source include/rpl_blackhole.test;
 
 connection master;
 DROP TABLE t1,t2;
diff --git a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
index 6d222cba115..573c1d111fc 100644
--- a/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
+++ b/mysql-test/suite/rpl/t/rpl_cant_read_event_incident.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_cant_read_event_incident.inc
+--source include/rpl_cant_read_event_incident.inc
diff --git a/mysql-test/suite/rpl/t/rpl_charset.test b/mysql-test/suite/rpl/t/rpl_charset.test
index 3ed9147508e..31ea2bc8f07 100644
--- a/mysql-test/suite/rpl/t/rpl_charset.test
+++ b/mysql-test/suite/rpl/t/rpl_charset.test
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
-source extra/rpl_tests/rpl_charset.test;
+source include/rpl_charset.test;
diff --git a/mysql-test/suite/rpl/t/rpl_checksum.test b/mysql-test/suite/rpl/t/rpl_checksum.test
index 8e006b1b6a0..0edf8fda7f3 100644
--- a/mysql-test/suite/rpl/t/rpl_checksum.test
+++ b/mysql-test/suite/rpl/t/rpl_checksum.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_checksum.inc
+--source include/rpl_checksum.inc
diff --git a/mysql-test/suite/rpl/t/rpl_checksum_cache.test b/mysql-test/suite/rpl/t/rpl_checksum_cache.test
index 56c3e1e1cb5..59b338d2556 100644
--- a/mysql-test/suite/rpl/t/rpl_checksum_cache.test
+++ b/mysql-test/suite/rpl/t/rpl_checksum_cache.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_checksum_cache.inc
+--source include/rpl_checksum_cache.inc
diff --git a/mysql-test/suite/rpl/t/rpl_commit_after_flush.test b/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
index 1e2ca875190..5d54790827c 100644
--- a/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
+++ b/mysql-test/suite/rpl/t/rpl_commit_after_flush.test
@@ -1,5 +1,5 @@
 -- source include/have_innodb.inc
 -- source include/master-slave.inc
 let $engine_type=innodb;
--- source extra/rpl_tests/rpl_commit_after_flush.test
+-- source include/rpl_commit_after_flush.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_corruption.test b/mysql-test/suite/rpl/t/rpl_corruption.test
index 310b0cef8e8..e51d1c65e95 100644
--- a/mysql-test/suite/rpl/t/rpl_corruption.test
+++ b/mysql-test/suite/rpl/t/rpl_corruption.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_corruption.inc
+--source include/rpl_corruption.inc
diff --git a/mysql-test/suite/rpl/t/rpl_ddl.test b/mysql-test/suite/rpl/t/rpl_ddl.test
index 2045ec97edd..b11a6927f09 100644
--- a/mysql-test/suite/rpl/t/rpl_ddl.test
+++ b/mysql-test/suite/rpl/t/rpl_ddl.test
@@ -28,5 +28,5 @@ let $engine_type= InnoDB;
 let $temp_engine_type= MEMORY;
 let $show_binlog = 0;
 let $manipulate = 0;
--- source extra/rpl_tests/rpl_ddl.test
+-- source include/rpl_ddl.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
index ade915da105..e2311cb06b5 100644
--- a/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
@@ -1,4 +1,4 @@
 -- source include/have_innodb.inc
 -- source include/long_test.inc
 let $engine_type=innodb;
--- source extra/rpl_tests/rpl_deadlock.test
+-- source include/rpl_deadlock.test
diff --git a/mysql-test/suite/rpl/t/rpl_delayed_slave.test b/mysql-test/suite/rpl/t/rpl_delayed_slave.test
index 2400a821e2b..7dd7b9cf6d9 100644
--- a/mysql-test/suite/rpl/t/rpl_delayed_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_delayed_slave.test
@@ -109,7 +109,7 @@ eval CHANGE MASTER TO MASTER_DELAY = $time2;
 INSERT INTO t1 VALUES ('normal setup', 1);
 
 --let $query_number= 1
---source extra/rpl_tests/delayed_slave_wait_on_query.inc
+--source include/delayed_slave_wait_on_query.inc
 
 
 --echo ==== Slave lags "naturally" after master ====
@@ -258,7 +258,7 @@ INSERT INTO t1 VALUES ('stop slave and start slave: DML', 7);
 --source include/rpl_assert.inc
 
 --let $query_number= 7
---source extra/rpl_tests/delayed_slave_wait_on_query.inc
+--source include/delayed_slave_wait_on_query.inc
 
 
 --echo ==== STOP SLAVE / START SLAVE + DDL ====
diff --git a/mysql-test/suite/rpl/t/rpl_delete_no_where.test b/mysql-test/suite/rpl/t/rpl_delete_no_where.test
index 9ab637063e0..c07649cb49a 100644
--- a/mysql-test/suite/rpl/t/rpl_delete_no_where.test
+++ b/mysql-test/suite/rpl/t/rpl_delete_no_where.test
@@ -1,4 +1,4 @@
 -- source include/master-slave.inc
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_delete_no_where.test
+-- source include/rpl_delete_no_where.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
index 201392346be..63ae0fce9ba 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test
@@ -6,6 +6,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
---source extra/rpl_tests/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
index 4f344cfaca9..72a35992fe5 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test
@@ -5,6 +5,6 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'MyISAM';
---source extra/rpl_tests/rpl_extra_col_master.test
+--source include/rpl_extra_col_master.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test b/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
index f4b04468273..e16e1dba408 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_innodb.test
@@ -3,5 +3,5 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
--- source extra/rpl_tests/rpl_extra_col_slave.test
+-- source include/rpl_extra_col_slave.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test b/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
index d8d64aed566..f1e9fa242cc 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
@@ -2,5 +2,5 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'MyISAM';
--- source extra/rpl_tests/rpl_extra_col_slave.test
+-- source include/rpl_extra_col_slave.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_failed_optimize.test b/mysql-test/suite/rpl/t/rpl_failed_optimize.test
index 99860f16966..a65c19cb38c 100644
--- a/mysql-test/suite/rpl/t/rpl_failed_optimize.test
+++ b/mysql-test/suite/rpl/t/rpl_failed_optimize.test
@@ -1,3 +1,3 @@
 -- source include/have_innodb.inc
 let $engine_type=InnoDB;
--- source extra/rpl_tests/rpl_failed_optimize.test
+-- source include/rpl_failed_optimize.test
diff --git a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
index ed28c2e9d1c..489e90f9eb5 100644
--- a/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test
@@ -1,3 +1,3 @@
 -- source include/have_innodb.inc
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_foreign_key.test
+-- source include/rpl_foreign_key.test
diff --git a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
index dca32c30a94..9c4cc1bc34d 100644
--- a/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+++ b/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
@@ -6,7 +6,7 @@
 # The COLLATION_SERVER and TIME_ZONE are got only on master server version 4.
 # So they can't be verified by test case here.
 # Finish the following tests by calling its common test script:  
-# extra/rpl_tests/rpl_get_master_version_and_clock.test. 
+# include/rpl_get_master_version_and_clock.test. 
 
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
@@ -28,17 +28,17 @@ call mtr.add_suppression("Slave I/O thread .* register on master");
 #Test case 1: Try to get the value of the UNIX_TIMESTAMP from master under network disconnection
 let $debug_saved= `select @@global.debug`;
 
-# set up two parameters to pass into extra/rpl_tests/rpl_get_master_version_and_clock
+# set up two parameters to pass into include/rpl_get_master_version_and_clock
 let $dbug_sync_point= 'debug_lock.before_get_UNIX_TIMESTAMP';
 let $debug_sync_action= 'now SIGNAL signal.get_unix_timestamp';
-source extra/rpl_tests/rpl_get_master_version_and_clock.test; 
+source include/rpl_get_master_version_and_clock.test; 
 
 #Test case 2: Try to get the value of the SERVER_ID from master under network disconnection
 connection slave;
 
 let $dbug_sync_point= 'debug_lock.before_get_SERVER_ID';
 let $debug_sync_action= 'now SIGNAL signal.get_server_id';
-source extra/rpl_tests/rpl_get_master_version_and_clock.test;
+source include/rpl_get_master_version_and_clock.test;
 
 eval set global debug_dbug= '$debug_saved';
 
diff --git a/mysql-test/suite/rpl/t/rpl_gtid_basic.test b/mysql-test/suite/rpl/t/rpl_gtid_basic.test
index e14bf89425d..004003ea524 100644
--- a/mysql-test/suite/rpl/t/rpl_gtid_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_gtid_basic.test
@@ -1,4 +1,4 @@
---source extra/rpl_tests/rpl_gtid_basic.inc
+--source include/rpl_gtid_basic.inc
 
 --echo #
 --echo # Start of 10.2 tests
diff --git a/mysql-test/suite/rpl/t/rpl_incident.test b/mysql-test/suite/rpl/t/rpl_incident.test
index 9be855e1a8b..4bb6477ca98 100644
--- a/mysql-test/suite/rpl/t/rpl_incident.test
+++ b/mysql-test/suite/rpl/t/rpl_incident.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_incident.inc
+--source include/rpl_incident.inc
diff --git a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
index 6f515b9390a..6f6ab7e8d7c 100644
--- a/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
+++ b/mysql-test/suite/rpl/t/rpl_init_slave_errors.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_init_slave_errors.inc
+--source include/rpl_init_slave_errors.inc
diff --git a/mysql-test/suite/rpl/t/rpl_insert_delayed.test b/mysql-test/suite/rpl/t/rpl_insert_delayed.test
index 342b9115de8..6a88899fec3 100644
--- a/mysql-test/suite/rpl/t/rpl_insert_delayed.test
+++ b/mysql-test/suite/rpl/t/rpl_insert_delayed.test
@@ -1,5 +1,5 @@
 --source include/not_embedded.inc
 --source include/not_windows.inc
 --source include/master-slave.inc
---source extra/rpl_tests/rpl_insert_delayed.test
+--source include/rpl_insert_delayed.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_insert_id.test b/mysql-test/suite/rpl/t/rpl_insert_id.test
index ad32ad24b33..c9d84049ff6 100644
--- a/mysql-test/suite/rpl/t/rpl_insert_id.test
+++ b/mysql-test/suite/rpl/t/rpl_insert_id.test
@@ -3,4 +3,4 @@
 #################################
 -- source include/have_innodb.inc
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_insert_id.test
+-- source include/rpl_insert_id.test
diff --git a/mysql-test/suite/rpl/t/rpl_insert_id_pk.test b/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
index 148afdac87b..d9ba2a2bdcc 100644
--- a/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
+++ b/mysql-test/suite/rpl/t/rpl_insert_id_pk.test
@@ -3,4 +3,4 @@
 #################################
 -- source include/have_innodb.inc
 let $engine_type=innodb;
--- source extra/rpl_tests/rpl_insert_id_pk.test
+-- source include/rpl_insert_id_pk.test
diff --git a/mysql-test/suite/rpl/t/rpl_insert_ignore.test b/mysql-test/suite/rpl/t/rpl_insert_ignore.test
index 0891a04db25..2940ad16bf2 100644
--- a/mysql-test/suite/rpl/t/rpl_insert_ignore.test
+++ b/mysql-test/suite/rpl/t/rpl_insert_ignore.test
@@ -7,9 +7,9 @@
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 
 -- let $engine_type=innodb
--- source extra/rpl_tests/rpl_insert_ignore.test
+-- source include/rpl_insert_ignore.test
 
 -- let $engine_type=myisam
--- source extra/rpl_tests/rpl_insert_ignore.test
+-- source include/rpl_insert_ignore.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_loaddata.test b/mysql-test/suite/rpl/t/rpl_loaddata.test
index 76b008caa92..9f0ba95a03f 100644
--- a/mysql-test/suite/rpl/t/rpl_loaddata.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddata.test
@@ -1,4 +1,4 @@
 -- source include/have_binlog_format_statement.inc
 
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_loaddata.test
+-- source include/rpl_loaddata.test
diff --git a/mysql-test/suite/rpl/t/rpl_loaddatalocal.test b/mysql-test/suite/rpl/t/rpl_loaddatalocal.test
index 8d90afaed27..712041467ab 100644
--- a/mysql-test/suite/rpl/t/rpl_loaddatalocal.test
+++ b/mysql-test/suite/rpl/t/rpl_loaddatalocal.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_loaddata_local.inc
+--source include/rpl_loaddata_local.inc
diff --git a/mysql-test/suite/rpl/t/rpl_loadfile.test b/mysql-test/suite/rpl/t/rpl_loadfile.test
index babf4208b3d..10fecf1f653 100644
--- a/mysql-test/suite/rpl/t/rpl_loadfile.test
+++ b/mysql-test/suite/rpl/t/rpl_loadfile.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_loadfile.inc
+--source include/rpl_loadfile.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
index 81b01cc9140..c4c89d9048b 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_mixed.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test
index d3412c3cd52..e707bb9973b 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_drop_create_temp_table.test
@@ -8,5 +8,5 @@
 --source include/have_innodb.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_drop_create_temp_table.test
+--source include/rpl_drop_create_temp_table.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
index fa948f8f5fe..e3dc6cbaa73 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_implicit_commit_binlog.test
@@ -1,5 +1,5 @@
 ################################################################################
-# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
+# Check file include/rpl_implicit_commit_binlog.test
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_mixed.inc
@@ -8,5 +8,5 @@
 
 --let $engine=Innodb
 set session storage_engine=innodb;
---source extra/rpl_tests/rpl_implicit_commit_binlog.test
+--source include/rpl_implicit_commit_binlog.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
index a9c8f6fe3e1..1df53270b74 100644
--- a/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_mixed_mixing_engines.test
@@ -8,5 +8,5 @@
 
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_multi_update.test b/mysql-test/suite/rpl/t/rpl_multi_update.test
index cc147eb3263..3927ed698e6 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_update.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_update.test
@@ -1,2 +1,2 @@
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_multi_update.test
+-- source include/rpl_multi_update.test
diff --git a/mysql-test/suite/rpl/t/rpl_multi_update2.test b/mysql-test/suite/rpl/t/rpl_multi_update2.test
index 95952cd9e15..d2368f2016b 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_update2.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_update2.test
@@ -5,5 +5,5 @@
 --source include/master-slave.inc
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT');
 let $engine_type=MyISAM;
---source extra/rpl_tests/rpl_multi_update2.test
+--source include/rpl_multi_update2.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_multi_update3.test b/mysql-test/suite/rpl/t/rpl_multi_update3.test
index d356ca88517..0a15e9aa229 100644
--- a/mysql-test/suite/rpl/t/rpl_multi_update3.test
+++ b/mysql-test/suite/rpl/t/rpl_multi_update3.test
@@ -5,5 +5,5 @@
 --source include/master-slave.inc
 call mtr.add_suppression('Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.');
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_multi_update3.test
+-- source include/rpl_multi_update3.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
index 93ec9acf5ea..1f2f8749a0c 100644
--- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
@@ -11,5 +11,5 @@ SET SESSION binlog_direct_non_transactional_updates = OFF;
 --enable_query_log
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
index 50577a1849c..b4552c79349 100644
--- a/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
@@ -11,7 +11,7 @@ SET SESSION binlog_direct_non_transactional_updates = OFF;
 --enable_query_log
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 
 --diff_files suite/rpl/r/rpl_non_direct_row_mixing_engines.result suite/rpl/r/rpl_row_mixing_engines.result
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
index e340eb74115..23552515df7 100644
--- a/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_non_direct_stm_mixing_engines.test
@@ -11,5 +11,5 @@ SET SESSION binlog_direct_non_transactional_updates = OFF;
 --enable_query_log
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_not_null_innodb.test b/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
index 6a1cc341060..0e67cd3600b 100644
--- a/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_not_null_innodb.test
@@ -16,5 +16,5 @@
 --source include/master-slave.inc
 
 let $engine=Innodb;
---source extra/rpl_tests/rpl_not_null.test
+--source include/rpl_not_null.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_not_null_myisam.test b/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
index 6ef0b65d5ff..718761d6d23 100644
--- a/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_not_null_myisam.test
@@ -15,5 +15,5 @@
 --source include/master-slave.inc
 
 let $engine=MyISAM;
---source extra/rpl_tests/rpl_not_null.test
+--source include/rpl_not_null.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_packet.test b/mysql-test/suite/rpl/t/rpl_packet.test
index 31357cb148e..1bf99c2366b 100644
--- a/mysql-test/suite/rpl/t/rpl_packet.test
+++ b/mysql-test/suite/rpl/t/rpl_packet.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_packet.inc
+--source include/rpl_packet.inc
diff --git a/mysql-test/suite/rpl/t/rpl_parallel.test b/mysql-test/suite/rpl/t/rpl_parallel.test
index b7c4bb429a4..ee39bfa7a39 100644
--- a/mysql-test/suite/rpl/t/rpl_parallel.test
+++ b/mysql-test/suite/rpl/t/rpl_parallel.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_parallel.inc
+--source include/rpl_parallel.inc
diff --git a/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test b/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
index 9e93b0b56e9..8c8892d5370 100644
--- a/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
+++ b/mysql-test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_parallel_show_binlog_events_purge_logs.inc
+--source include/rpl_parallel_show_binlog_events_purge_logs.inc
diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
index 87df66bc148..ccb1424a976 100644
--- a/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_innodb.test
@@ -1,3 +1,3 @@
 -- source include/have_innodb.inc
 let $engine_type=InnoDB;
--- source extra/rpl_tests/rpl_sv_relay_space.test
+-- source include/rpl_sv_relay_space.test
diff --git a/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
index e022921a5bb..6aa91dbccaa 100644
--- a/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_relay_space_myisam.test
@@ -1,2 +1,2 @@
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_sv_relay_space.test
+-- source include/rpl_sv_relay_space.test
diff --git a/mysql-test/suite/rpl/t/rpl_relayrotate.test b/mysql-test/suite/rpl/t/rpl_relayrotate.test
index 5e3bcdcd711..720739e14c0 100644
--- a/mysql-test/suite/rpl/t/rpl_relayrotate.test
+++ b/mysql-test/suite/rpl/t/rpl_relayrotate.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_relayrotate.inc
+--source include/rpl_relayrotate.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_001.test b/mysql-test/suite/rpl/t/rpl_row_001.test
index 47b6da75dd6..06d01f2476e 100644
--- a/mysql-test/suite/rpl/t/rpl_row_001.test
+++ b/mysql-test/suite/rpl/t/rpl_row_001.test
@@ -7,5 +7,5 @@
 -- source include/master-slave.inc
 
 let $engine_type=MYISAM;
--- source extra/rpl_tests/rpl_row_001.test
+-- source include/rpl_row_001.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_UUID.test b/mysql-test/suite/rpl/t/rpl_row_UUID.test
index 1de44af8156..8e1aa6d20d0 100644
--- a/mysql-test/suite/rpl/t/rpl_row_UUID.test
+++ b/mysql-test/suite/rpl/t/rpl_row_UUID.test
@@ -4,5 +4,5 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=myisam;
---source extra/rpl_tests/rpl_row_UUID.test
+--source include/rpl_row_UUID.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test
index 4114f90b90b..ffaae3146f3 100644
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_do.test
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_do.test
@@ -13,4 +13,4 @@
 ###############################################################################
 
 --source include/have_binlog_format_row.inc
---source extra/rpl_tests/rpl_row_annotate.test
+--source include/rpl_row_annotate.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test
index ef746e76b4d..24dd2a1c373 100644
--- a/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test
+++ b/mysql-test/suite/rpl/t/rpl_row_annotate_dont.test
@@ -6,4 +6,4 @@
 ###############################################################################
 
 --source include/have_binlog_format_row.inc
---source extra/rpl_tests/rpl_row_annotate.test
+--source include/rpl_row_annotate.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
index d4a1777a8dc..f1e836c64b7 100644
--- a/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_2myisam.test
@@ -3,7 +3,7 @@
 
 let $type= 'MYISAM' ;
 let $extra_index= ;
--- source extra/rpl_tests/rpl_row_basic.test
+-- source include/rpl_row_basic.test
 
 connection slave;
 call mtr.add_suppression("Can't find record in 't1'");
diff --git a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
index 55ea2f3c3c8..b84a4c13c80 100644
--- a/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_basic_3innodb.test
@@ -6,6 +6,6 @@ connection slave;
 let $bit_field_special = ALL_LOSSY;
 let $type= 'INNODB' ;
 let $extra_index= ;
--- source extra/rpl_tests/rpl_row_basic.test
+-- source include/rpl_row_basic.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
index cc031d382e0..a4db32cf46e 100644
--- a/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_row_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_row.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test b/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
index 5c1c705f48d..57f3e91aa10 100644
--- a/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_blob_innodb.test
@@ -8,6 +8,6 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=InnoDB;
--- source extra/rpl_tests/rpl_row_blob.test
+-- source include/rpl_row_blob.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test b/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
index e83da6ba142..246d38f486c 100644
--- a/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_row_blob_myisam.test
@@ -7,6 +7,6 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_row_blob.test
+-- source include/rpl_row_blob.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_conflicts.test b/mysql-test/suite/rpl/t/rpl_row_conflicts.test
index 9ad33a4b819..adf37d99073 100644
--- a/mysql-test/suite/rpl/t/rpl_row_conflicts.test
+++ b/mysql-test/suite/rpl/t/rpl_row_conflicts.test
@@ -1,4 +1,4 @@
-# See the top of mysql-test/extra/rpl_tests/rpl_conflicts.test for
+# See the top of mysql-test/include/rpl_conflicts.test for
 # explanation of what this test does.
 #
 # This test file is for row-logging mode. It runs the test twice, with
@@ -18,7 +18,7 @@ SET @old_slave_exec_mode= @@global.slave_exec_mode;
 --echo ######## Run with slave_exec_mode=STRICT ########
 
 SET @@global.slave_exec_mode = 'STRICT';
-source extra/rpl_tests/rpl_conflicts.test;
+source include/rpl_conflicts.test;
 
 --source include/rpl_reset.inc
 
@@ -26,7 +26,7 @@ source extra/rpl_tests/rpl_conflicts.test;
 --echo ######## Run with slave_exec_mode=IDEMPOTENT ########
 
 set @@global.slave_exec_mode= 'IDEMPOTENT';
-source extra/rpl_tests/rpl_conflicts.test;
+source include/rpl_conflicts.test;
 
 
 SET @@global.slave_exec_mode= @old_slave_exec_mode;
diff --git a/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test b/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
index b898a9a120a..603af39834c 100644
--- a/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
+++ b/mysql-test/suite/rpl/t/rpl_row_delayed_ins.test
@@ -1,2 +1,2 @@
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_row_delayed_ins.test
+-- source include/rpl_row_delayed_ins.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test
index c3aa937be6f..bc5c60749c0 100644
--- a/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test
+++ b/mysql-test/suite/rpl/t/rpl_row_drop_create_temp_table.test
@@ -7,5 +7,5 @@
 --source include/have_innodb.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_drop_create_temp_table.test
+--source include/rpl_drop_create_temp_table.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
index 71cd4a5b9ae..2d5cde82dcc 100644
--- a/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
+++ b/mysql-test/suite/rpl/t/rpl_row_flsh_tbls.test
@@ -9,5 +9,5 @@ let $rename_event_pos= `select @binlog_start_pos + 819`;
 # we disable the ps-protocol for this statement.
 
 --disable_ps_protocol
--- source extra/rpl_tests/rpl_flsh_tbls.test
+-- source include/rpl_flsh_tbls.test
 --enable_ps_protocol
diff --git a/mysql-test/suite/rpl/t/rpl_row_func003.test b/mysql-test/suite/rpl/t/rpl_row_func003.test
index c153bc70253..def987faede 100644
--- a/mysql-test/suite/rpl/t/rpl_row_func003.test
+++ b/mysql-test/suite/rpl/t/rpl_row_func003.test
@@ -8,5 +8,5 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_row_func003.test
+-- source include/rpl_row_func003.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_blobs.test b/mysql-test/suite/rpl/t/rpl_row_img_blobs.test
index 467202391b0..21f224f5ad2 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_blobs.test
+++ b/mysql-test/suite/rpl/t/rpl_row_img_blobs.test
@@ -36,7 +36,7 @@
 -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
 -- source include/rpl_row_img_set.inc
 
--- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test
+-- let $row_img_test_script= include/rpl_row_img_blobs.test
 -- source include/rpl_row_img_general_loop.inc
 
 ## MINIMAL
@@ -44,7 +44,7 @@
 -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y
 -- source include/rpl_row_img_set.inc
 
--- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test
+-- let $row_img_test_script= include/rpl_row_img_blobs.test
 -- source include/rpl_row_img_general_loop.inc
 
 ## FULL
@@ -52,7 +52,7 @@
 -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
 -- source include/rpl_row_img_set.inc
 
--- let $row_img_test_script= extra/rpl_tests/rpl_row_img_blobs.test
+-- let $row_img_test_script= include/rpl_row_img_blobs.test
 -- source include/rpl_row_img_general_loop.inc
 
 
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test b/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
index 24b9655bd81..06764fe8f07 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
+++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
@@ -29,7 +29,7 @@
 -- let $row_img_set=server_1:MINIMAL:N,server_2:MINIMAL:Y,server_3:MINIMAL:Y
 -- source include/rpl_row_img_set.inc
 
--- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test
+-- let $row_img_test_script= include/rpl_row_img.test
 -- source include/rpl_row_img_general_loop.inc
 
 -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
diff --git a/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test b/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
index 5d5f95a6552..7f4944b59ea 100644
--- a/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
+++ b/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
@@ -29,7 +29,7 @@
 -- let $row_img_set=server_1:NOBLOB:N,server_2:NOBLOB:Y,server_3:NOBLOB:Y
 -- source include/rpl_row_img_set.inc
 
--- let $row_img_test_script= extra/rpl_tests/rpl_row_img.test
+-- let $row_img_test_script= include/rpl_row_img.test
 -- source include/rpl_row_img_general_loop.inc
 
 -- let $row_img_set=server_1:FULL:N,server_2:FULL:Y,server_3:FULL:Y
diff --git a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
index 6fdcd885930..68e07ef1f44 100644
--- a/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
@@ -1,5 +1,5 @@
 ################################################################################
-# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
+# Check file include/rpl_implicit_commit_binlog.test
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_row.inc
@@ -8,5 +8,5 @@
 
 --let $engine=Innodb
 set session storage_engine=innodb;
---source extra/rpl_tests/rpl_implicit_commit_binlog.test
+--source include/rpl_implicit_commit_binlog.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
index af4efed872f..c2cb2b4a7f6 100644
--- a/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
+++ b/mysql-test/suite/rpl/t/rpl_row_loaddata_concurrent.test
@@ -10,4 +10,4 @@ DROP TABLE t1;
 
 let $lock_option= CONCURRENT;
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_loaddata.test
+-- source include/rpl_loaddata.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_log.test b/mysql-test/suite/rpl/t/rpl_row_log.test
index 1d37d4327d0..25fcc4f4e58 100644
--- a/mysql-test/suite/rpl/t/rpl_row_log.test
+++ b/mysql-test/suite/rpl/t/rpl_row_log.test
@@ -10,6 +10,6 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_log.test
+-- source include/rpl_log.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_log_innodb.test b/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
index 0eccde7ecb9..92fe0eb9665 100644
--- a/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_log_innodb.test
@@ -8,6 +8,6 @@
 -- source include/have_innodb.inc
 -- source include/master-slave.inc
 let $engine_type=InnoDB;
--- source extra/rpl_tests/rpl_log.test
+-- source include/rpl_log.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
index 3e057d48ec9..0ec85244a6b 100644
--- a/mysql-test/suite/rpl/t/rpl_row_max_relay_size.test
+++ b/mysql-test/suite/rpl/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 include/rpl_max_relay_size.test;
diff --git a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
index cf402752812..c1a13cd9e52 100644
--- a/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_row_mixing_engines.test
@@ -8,5 +8,5 @@
 
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test b/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
index b3808680db2..39149f6bcbb 100644
--- a/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_rec_comp_innodb.test
@@ -7,5 +7,5 @@
 #
 
 -- let $engine= InnoDB
--- source extra/rpl_tests/rpl_record_compare.test
+-- source include/rpl_record_compare.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test b/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
index 0d6b08bd0c1..d9c06d6b25f 100644
--- a/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_row_rec_comp_myisam.test
@@ -27,6 +27,6 @@ UPDATE t1 SET c1= 0;
 DROP TABLE t1; 
 -- sync_slave_with_master
 
--- source extra/rpl_tests/rpl_record_compare.test
+-- source include/rpl_record_compare.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_reset_slave.test b/mysql-test/suite/rpl/t/rpl_row_reset_slave.test
index a970c161153..284c6154e8b 100644
--- a/mysql-test/suite/rpl/t/rpl_row_reset_slave.test
+++ b/mysql-test/suite/rpl/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 include/rpl_reset_slave.test
 
diff --git a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
index 0882d603203..3d4b8f1e3eb 100644
--- a/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
+++ b/mysql-test/suite/rpl/t/rpl_row_show_relaylog_events.test
@@ -15,5 +15,5 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 
--- source extra/rpl_tests/rpl_show_relaylog_events.inc
+-- source include/rpl_show_relaylog_events.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
index c863c9c02e1..f096c157059 100644
--- a/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_sp002_innodb.test
@@ -1,3 +1,3 @@
 -- source include/have_innodb.inc
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_row_sp002.test
+-- source include/rpl_row_sp002.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_sp003.test b/mysql-test/suite/rpl/t/rpl_row_sp003.test
index f1cad89b58e..0a361202e94 100644
--- a/mysql-test/suite/rpl/t/rpl_row_sp003.test
+++ b/mysql-test/suite/rpl/t/rpl_row_sp003.test
@@ -12,5 +12,5 @@
 -- source include/master-slave.inc
 
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_row_sp003.test
+-- source include/rpl_row_sp003.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
index f8ff2b2ca8e..c575a105b68 100644
--- a/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
+++ b/mysql-test/suite/rpl/t/rpl_row_sp006_InnoDB.test
@@ -8,5 +8,5 @@
 -- source include/have_binlog_format_row.inc
 -- source include/master-slave.inc
 let $engine_type=InnoDB;
--- source extra/rpl_tests/rpl_row_sp006.test
+-- source include/rpl_row_sp006.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
index e2003092d10..6eaafa8cce5 100644
--- a/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_sp007_innodb.test
@@ -1,3 +1,3 @@
 -- source include/have_innodb.inc
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_row_sp007.test
+-- source include/rpl_row_sp007.test
diff --git a/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
index 030ec7d6541..e1ecf70206a 100644
--- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_2myisam.test
@@ -3,7 +3,7 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'MyISAM';
--- source extra/rpl_tests/rpl_row_tabledefs.test
+-- source include/rpl_row_tabledefs.test
 
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
index 35eddfc3ed4..49abc84c58a 100644
--- a/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_row_tabledefs_3innodb.test
@@ -4,7 +4,7 @@
 -- source include/master-slave.inc
 
 let $engine_type = 'InnoDB';
--- source extra/rpl_tests/rpl_row_tabledefs.test
+-- source include/rpl_row_tabledefs.test
 
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_row_trig004.test b/mysql-test/suite/rpl/t/rpl_row_trig004.test
index e10e0d51039..0cbdea335be 100644
--- a/mysql-test/suite/rpl/t/rpl_row_trig004.test
+++ b/mysql-test/suite/rpl/t/rpl_row_trig004.test
@@ -10,6 +10,6 @@
 -- source include/have_innodb.inc
 -- source include/master-slave.inc
 let $engine_type=INNODB;
--- source extra/rpl_tests/rpl_trig004.test
+-- source include/rpl_trig004.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_semi_sync.test b/mysql-test/suite/rpl/t/rpl_semi_sync.test
index d5f80619aeb..5c17bcb2344 100644
--- a/mysql-test/suite/rpl/t/rpl_semi_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_semi_sync.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_semi_sync.inc
+--source include/rpl_semi_sync.inc
diff --git a/mysql-test/suite/rpl/t/rpl_set_null_innodb.test b/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
index 5ef10263498..84f7adb32a9 100644
--- a/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
@@ -3,5 +3,5 @@
 -- source include/master-slave.inc
 
 -- let $engine= InnoDB
--- source extra/rpl_tests/rpl_set_null.test
+-- source include/rpl_set_null.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_set_null_myisam.test b/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
index 13cd7c3e4a8..db1bd4b77e7 100644
--- a/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
@@ -2,5 +2,5 @@
 -- source include/master-slave.inc
 
 -- let $engine= MyISAM
--- source extra/rpl_tests/rpl_set_null.test
+-- source include/rpl_set_null.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_skip_replication.test b/mysql-test/suite/rpl/t/rpl_skip_replication.test
index c57256780a4..66fdbb8915a 100644
--- a/mysql-test/suite/rpl/t/rpl_skip_replication.test
+++ b/mysql-test/suite/rpl/t/rpl_skip_replication.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_skip_replication.inc
+--source include/rpl_skip_replication.inc
diff --git a/mysql-test/suite/rpl/t/rpl_special_charset.test b/mysql-test/suite/rpl/t/rpl_special_charset.test
index 6f196005711..fa19a17b1e4 100644
--- a/mysql-test/suite/rpl/t/rpl_special_charset.test
+++ b/mysql-test/suite/rpl/t/rpl_special_charset.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_special_charset.inc
+--source include/rpl_special_charset.inc
diff --git a/mysql-test/suite/rpl/t/rpl_sporadic_master.test b/mysql-test/suite/rpl/t/rpl_sporadic_master.test
index 0a756982047..397756af396 100644
--- a/mysql-test/suite/rpl/t/rpl_sporadic_master.test
+++ b/mysql-test/suite/rpl/t/rpl_sporadic_master.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_sporadic_master.inc
+--source include/rpl_sporadic_master.inc
diff --git a/mysql-test/suite/rpl/t/rpl_ssl.test b/mysql-test/suite/rpl/t/rpl_ssl.test
index 883b367e9f2..c4a534b9294 100644
--- a/mysql-test/suite/rpl/t/rpl_ssl.test
+++ b/mysql-test/suite/rpl/t/rpl_ssl.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_ssl.inc
+--source include/rpl_ssl.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test b/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
index face651b9a1..07b1000c99b 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_EE_err2.test
@@ -5,4 +5,4 @@
 ##############################
 -- source include/have_binlog_format_mixed_or_statement.inc
 let $engine_type=myisam;
--- source extra/rpl_tests/rpl_stm_EE_err2.test
+-- source include/rpl_stm_EE_err2.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
index 93cc06111e4..f893f9090e4 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_binlog_max_cache_size.test
@@ -4,5 +4,5 @@
 --source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_binlog_max_cache_size.test
+--source include/rpl_binlog_max_cache_size.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_conflicts.test b/mysql-test/suite/rpl/t/rpl_stm_conflicts.test
index cd9e71cbff9..a4f592531a3 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_conflicts.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_conflicts.test
@@ -1,6 +1,6 @@
 source include/have_binlog_format_mixed_or_statement.inc;
 source include/master-slave.inc;
 
-source extra/rpl_tests/rpl_conflicts.test;
+source include/rpl_conflicts.test;
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
index b395654a714..b971af71766 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_drop_create_temp_table.test
@@ -8,5 +8,5 @@
 --source include/have_innodb.inc
 --source include/master-slave.inc
 
---source extra/rpl_tests/rpl_drop_create_temp_table.test
+--source include/rpl_drop_create_temp_table.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
index 83ef8699425..70178c2e32d 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_flsh_tbls.test
@@ -3,4 +3,4 @@
 --source include/binlog_start_pos.inc
 
 let $rename_event_pos= `select @binlog_start_pos + 578`;
--- source extra/rpl_tests/rpl_flsh_tbls.test
+-- source include/rpl_flsh_tbls.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
index 774c87f551e..a095f7f7905 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_implicit_commit_binlog.test
@@ -1,5 +1,5 @@
 ################################################################################
-# Check file extra/rpl_tests/rpl_implicit_commit_binlog.test
+# Check file include/rpl_implicit_commit_binlog.test
 ################################################################################
 --source include/have_udf.inc
 --source include/have_binlog_format_statement.inc
@@ -8,5 +8,5 @@
 
 --let $engine=Innodb
 set session storage_engine=innodb;
---source extra/rpl_tests/rpl_implicit_commit_binlog.test
+--source include/rpl_implicit_commit_binlog.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_innodb.test b/mysql-test/suite/rpl/t/rpl_stm_innodb.test
index 97bfd168438..dbfbc7f6c64 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_innodb.test
@@ -5,5 +5,5 @@ source include/have_innodb.inc;
 source include/have_binlog_format_mixed_or_statement.inc;
 source include/master-slave.inc;
 
-source extra/rpl_tests/rpl_innodb.test;
+source include/rpl_innodb.test;
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
index 32de2a94cbb..4409a1a8db5 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_loaddata_concurrent.test
@@ -11,4 +11,4 @@ DROP TABLE t1;
 
 let $lock_option= CONCURRENT;
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_loaddata.test
+-- source include/rpl_loaddata.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_loadfile.test b/mysql-test/suite/rpl/t/rpl_stm_loadfile.test
index 016d3ed6090..5ff3846d2b9 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_loadfile.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_loadfile.test
@@ -19,6 +19,6 @@ disable_query_log;
 call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");
 enable_query_log;
 
--- source extra/rpl_tests/rpl_loadfile.test
+-- source include/rpl_loadfile.test
 
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_log.test b/mysql-test/suite/rpl/t/rpl_stm_log.test
index 23130528465..4a0df44204a 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_log.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_log.test
@@ -2,7 +2,7 @@
 -- source include/have_binlog_format_statement.inc
 -- source include/master-slave.inc
 let $engine_type=MyISAM;
--- source extra/rpl_tests/rpl_log.test
+-- source include/rpl_log.test
 
 # End of 4.1 tests
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test b/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
index 1a7139c889a..bea51ed21f9 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_max_relay_size.test
@@ -5,4 +5,4 @@
 
 # Requires statement logging
 -- source include/have_binlog_format_mixed_or_statement.inc
--- source extra/rpl_tests/rpl_max_relay_size.test
+-- source include/rpl_max_relay_size.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test b/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
index 2b7aeed28ce..ab823799f5d 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_mix_show_relaylog_events.test
@@ -15,5 +15,5 @@
 -- source include/have_binlog_format_mixed_or_statement.inc
 -- source include/master-slave.inc
 
--- source extra/rpl_tests/rpl_show_relaylog_events.inc
+-- source include/rpl_show_relaylog_events.inc
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
index 9a92d60a2a1..9cb440b6599 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_mixing_engines.test
@@ -8,7 +8,7 @@
 
 let $engine_type=Innodb;
 let $database_name=test;
---source extra/rpl_tests/rpl_mixing_engines.test
+--source include/rpl_mixing_engines.test
 
 #
 # BUG#49522: Replication problem with mixed MyISAM/InnoDB
diff --git a/mysql-test/suite/rpl/t/rpl_stm_multi_query.test b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
index e234f4b9622..2a593efdb35 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_multi_query.test
@@ -4,4 +4,4 @@
 # one binlog event containing all queries)
 
 -- source include/have_binlog_format_mixed_or_statement.inc
--- source extra/rpl_tests/rpl_multi_query.test
+-- source include/rpl_multi_query.test
diff --git a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
index f72300ee2de..b4e53358712 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_stm_relay_ign_space.inc
+--source include/rpl_stm_relay_ign_space.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test b/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
index 6a99d4e1613..e32b0a789b2 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_reset_slave.test
+++ b/mysql-test/suite/rpl/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 include/rpl_reset_slave.test
 
 # End of 4.1 tests
 #
diff --git a/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
index 76b2aed3f24..f401db33853 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test
@@ -1,5 +1,5 @@
 ################################################################################
-# Please, check ./extra/rpl_tests/rpl_start_stop_slave.test
+# Please, check ./include/rpl_start_stop_slave.test
 ################################################################################
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc
@@ -14,7 +14,7 @@ SET @old_innodb_flush_log_at_trx_commit= @@global.innodb_flush_log_at_trx_commit
 SET @@global.innodb_flush_log_at_trx_commit= 0;
 
 SET @@session.binlog_direct_non_transactional_updates= FALSE;
---source ./extra/rpl_tests/rpl_start_stop_slave.test
+--source ./include/rpl_start_stop_slave.test
 
 # clean up
 --connection slave
diff --git a/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test b/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
index 31880d17dfb..f2315f5e8c7 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_stop_middle_group.test
@@ -1,5 +1,5 @@
 ###################################################################################
-# Please, check extra/rpl_tests/rpl_stop_middle_group.test.
+# Please, check include/rpl_stop_middle_group.test.
 ###################################################################################
 -- source include/have_debug.inc
 -- source include/have_innodb.inc
@@ -7,5 +7,5 @@
 -- source include/master-slave.inc
 
 SET @@session.binlog_direct_non_transactional_updates= FALSE;
--- source extra/rpl_tests/rpl_stop_middle_group.test
+-- source include/rpl_stop_middle_group.test
 --source include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_stop_slave.test b/mysql-test/suite/rpl/t/rpl_stop_slave.test
index c650991a42b..291524126ec 100644
--- a/mysql-test/suite/rpl/t/rpl_stop_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_stop_slave.test
@@ -30,14 +30,14 @@ source include/start_slave.inc;
 --echo # CREATE TEMPORARY TABLE with InnoDB engine
 --echo # -----------------------------------------
 let $tmp_table_stm= CREATE TEMPORARY TABLE tt1(c1 INT) ENGINE = InnoDB;
-source extra/rpl_tests/rpl_stop_slave.test;
+source include/rpl_stop_slave.test;
 
 --echo
 --echo # CREATE TEMPORARY TABLE ... SELECT with InnoDB engine
 --echo # ----------------------------------------------------
 let $tmp_table_stm= CREATE TEMPORARY TABLE tt1(c1 INT) ENGINE = InnoDB
                     SELECT c1 FROM t2;
-source extra/rpl_tests/rpl_stop_slave.test;
+source include/rpl_stop_slave.test;
 
 # Don't need to verify 'CREATE TEMPORARY TABLE' with MyIASM engine, as it
 # never is binlogged into a transaction since 5.5.
diff --git a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
index cd826c6be1e..2625508515b 100644
--- a/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
+++ b/mysql-test/suite/rpl/t/rpl_switch_stm_row_mixed.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_switch_stm_row_mixed.inc
+--source include/rpl_switch_stm_row_mixed.inc
diff --git a/mysql-test/suite/rpl/t/rpl_sync.test b/mysql-test/suite/rpl/t/rpl_sync.test
index ec98a344282..bdb0d8ec4cc 100644
--- a/mysql-test/suite/rpl/t/rpl_sync.test
+++ b/mysql-test/suite/rpl/t/rpl_sync.test
@@ -1,2 +1,2 @@
---source extra/rpl_tests/rpl_sync.inc
+--source include/rpl_sync_test.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test b/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test
index 99a70e011c4..d976ae3757b 100644
--- a/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test
+++ b/mysql-test/suite/rpl/t/rpl_temporal_format_default_to_default.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_temporal_format_default_to_default.inc
+--source include/rpl_temporal_format_default_to_default.inc
diff --git a/mysql-test/suite/rpl/t/rpl_test_framework.test b/mysql-test/suite/rpl/t/rpl_test_framework.test
index e0f961caff1..cf559072e2f 100644
--- a/mysql-test/suite/rpl/t/rpl_test_framework.test
+++ b/mysql-test/suite/rpl/t/rpl_test_framework.test
@@ -5,8 +5,8 @@
 # is correct.
 #
 # We test a number of different topologies.  Each topology is tested
-# in extra/rpl_tests/rpl_test_framework.inc.  See
-# extra/rpl_tests/rpl_test_framework.inc for details on how the sync
+# in include/rpl_test_framework.inc.  See
+# include/rpl_test_framework.inc for details on how the sync
 # chain is tested.
 #
 # ==== Related bugs ====
@@ -36,7 +36,7 @@ CREATE TABLE t1 (a INT);
 --source include/rpl_end.inc
 
 # Initialize $next_number before first call to
-# extra/rpl_tests/rpl_test_framework.text
+# include/rpl_test_framework.text
 --let $next_number= 0
 
 
@@ -46,43 +46,43 @@ CREATE TABLE t1 (a INT);
 
 --let $rpl_topology= 1 -> 2
 --let $masters= 1,3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 2 -> 3
 --let $masters= 1,2
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= none
 --let $masters= 1,2,3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->2, 2->1
 --let $masters= 1,3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->2->1
 --let $masters= 2,3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 2->1->2
 --let $masters= 1,3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->2->3
 --let $masters= 1
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 2->3->2->1
 --let $masters= 3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->2,2->3,3->1
 --let $masters= 3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->3->2->1
 --let $masters= 3
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 
 --echo ==== Test 6-server topologies ====
@@ -91,19 +91,19 @@ CREATE TABLE t1 (a INT);
 
 --let $rpl_topology= 1->2->3->4->1->5->6
 --let $masters= 1
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 3->4->5->6->3->1->2
 --let $masters= 4
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 6->5->4->3->2->1
 --let $masters= 6
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 --let $rpl_topology= 1->2->3->1,4->5->6
 --let $masters= 3,4
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 
 --echo ==== Test 9-server topology ====
@@ -112,7 +112,7 @@ CREATE TABLE t1 (a INT);
 
 --let $rpl_topology= 1->2, 2->3, 3->4, 4->5, 5->1, 1->6, 6->7, 6->8, 8->9
 --let $masters= 2
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 if ($mtr_supports_more_than_10_servers) {
 --echo ==== Test 15-server topologies ====
@@ -121,12 +121,12 @@ if ($mtr_supports_more_than_10_servers) {
 
 --let $rpl_topology= 1->2->3->4->5->6->7->8->9->10->11->12->13->14->15->1
 --let $masters= 2
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 
 # This is a binary tree
 --let $rpl_topology= 1->2->4->8,1->3->6->12,2->5->10,3->7->14,4->9,5->11,6->13,7->15
 --let $masters= 1
---source extra/rpl_tests/rpl_test_framework.inc
+--source include/rpl_test_framework.inc
 }
 
 --echo ==== Clean up ====
diff --git a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
index bc4119f332f..7029729d299 100644
--- a/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
+++ b/mysql-test/suite/rpl/t/rpl_tmp_table_and_DDL.test
@@ -9,7 +9,7 @@ source include/have_binlog_format_row.inc;
 source include/master-slave.inc;
 
 LET $ENGINE_TYPE= MyISAM;
-source extra/rpl_tests/rpl_tmp_table_and_DDL.test;
+source include/rpl_tmp_table_and_DDL.test;
 sync_slave_with_master;
 
 #
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test b/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
index 4a8994d1878..e8b55b86aba 100644
--- a/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
+++ b/mysql-test/suite/rpl/t/rpl_truncate_2myisam.test
@@ -1,2 +1,2 @@
 let $engine=MyISAM;
---source extra/rpl_tests/rpl_truncate.test
+--source include/rpl_truncate.test
diff --git a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
index fbedaed87c1..bac911b985e 100644
--- a/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
+++ b/mysql-test/suite/rpl/t/rpl_truncate_3innodb.test
@@ -1,3 +1,3 @@
 --source include/have_innodb.inc
 let $engine=InnoDB;
---source extra/rpl_tests/rpl_truncate.test
+--source include/rpl_truncate.test
diff --git a/mysql-test/suite/rpl/t/rpl_typeconv.test b/mysql-test/suite/rpl/t/rpl_typeconv.test
index 4dbfc27d088..c2517086258 100644
--- a/mysql-test/suite/rpl/t/rpl_typeconv.test
+++ b/mysql-test/suite/rpl/t/rpl_typeconv.test
@@ -1 +1 @@
---source extra/rpl_tests/rpl_typeconv.inc
+--source include/rpl_typeconv.inc