rpl tests: move "include/master-slave.inc" down to be after all possible

checks that can skip the test

10 files changed, 13 insertions, 12 deletions

diff --git a/mysql-test/suite/rpl/t/rpl_bug37426.test b/mysql-test/suite/rpl/t/rpl_bug37426.test
index d0a60524fef..18e80a5f806 100644
--- a/mysql-test/suite/rpl/t/rpl_bug37426.test
+++ b/mysql-test/suite/rpl/t/rpl_bug37426.test
@@ -3,8 +3,8 @@
 #   RBR breaks for CHAR() UTF8 fields > 85 chars
 #############################################################
 
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
 
 connection master;
 CREATE TABLE char128_utf8 (i1 INT NOT NULL, c CHAR(128) CHARACTER SET utf8 NOT NULL, i2 INT NOT NULL);
diff --git a/mysql-test/suite/rpl/t/rpl_connection.test b/mysql-test/suite/rpl/t/rpl_connection.test
index 1233e28dc86..310240061d1 100644
--- a/mysql-test/suite/rpl/t/rpl_connection.test
+++ b/mysql-test/suite/rpl/t/rpl_connection.test
@@ -1,6 +1,6 @@
 --source include/not_embedded.inc
---source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 #
 # BUG#13427949: CHANGE MASTER TO USER='' (EMPTY USER) CAUSES ERRORS ON VALGRING 
diff --git a/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
index ee41df6592b..ab263ece407 100644
--- a/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
+++ b/mysql-test/suite/rpl/t/rpl_known_bugs_detection.test
@@ -8,13 +8,14 @@ call mtr.add_suppression("Unsafe statement written to the binary log using state
 source include/have_debug.inc;
 # because of pretend_version_50034_in_binlog the test can't run with checksum
 source include/have_binlog_checksum_off.inc;
-source include/master-slave.inc;
-
-call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
 
 # Currently only statement-based-specific bugs are here
 -- source include/have_binlog_format_statement.inc
 
+source include/master-slave.inc;
+
+call mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT.");
+
 #
 # This is to test that slave properly detects if
 # master may suffer from:
diff --git a/mysql-test/suite/rpl/t/rpl_mix_found_rows.test b/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
index ed932eb5cea..433280326c7 100644
--- a/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
+++ b/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;
 
 # It is not possible to replicate FOUND_ROWS() using statement-based
 # replication, but there is a workaround that stores the result of
diff --git a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
index af7ccf74295..fb7491b0077 100644
--- a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
+++ b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test
@@ -1,9 +1,9 @@
 #
 # Bug#11760927: 53375: RBR + NO PK => HIGH LOAD ON SLAVE (TABLE SCAN/CPU) => SLAVE FAILURE
 #
---source include/master-slave.inc
 --source include/have_binlog_format_row.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 
 # SETUP
 # - setup log_warnings and debug 
diff --git a/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test b/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
index 9e6485d6630..31eea3a2068 100644
--- a/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
+++ b/mysql-test/suite/rpl/t/rpl_row_unsafe_funcs.test
@@ -1,5 +1,5 @@
-source include/master-slave.inc;
 source include/have_binlog_format_mixed.inc;
+source include/master-slave.inc;
 
 #
 # Bug #30244: row_count/found_rows does not replicate well
diff --git a/mysql-test/suite/rpl/t/rpl_row_utf32.test b/mysql-test/suite/rpl/t/rpl_row_utf32.test
index 936d62b09bd..c82cd4e5c2f 100644
--- a/mysql-test/suite/rpl/t/rpl_row_utf32.test
+++ b/mysql-test/suite/rpl/t/rpl_row_utf32.test
@@ -1,6 +1,6 @@
--- source include/master-slave.inc
 -- source include/have_binlog_format_row.inc
 -- source include/have_utf32.inc
+-- source include/master-slave.inc
 
 #
 # BUG#51787 Assertion `(n % 4) == 0' on slave upon INSERT into a table with UTF32
diff --git a/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test b/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
index 0eb41d1c6bd..56821621bfe 100644
--- a/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
+++ b/mysql-test/suite/rpl/t/rpl_stm_sql_mode.test
@@ -1,5 +1,5 @@
--- source include/master-slave.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
 
 #
 # Bug #51055    Replication failure on duplicate key + traditional SQL mode
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 84d663298c4..31880d17dfb 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
@@ -2,9 +2,9 @@
 # Please, check extra/rpl_tests/rpl_stop_middle_group.test.
 ###################################################################################
 -- source include/have_debug.inc
--- source include/master-slave.inc
 -- source include/have_innodb.inc
 -- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
 
 SET @@session.binlog_direct_non_transactional_updates= FALSE;
 -- source extra/rpl_tests/rpl_stop_middle_group.test
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 aa22b23925c..e9cc098857e 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
@@ -5,8 +5,8 @@
 # does not exist' base on myisam engine.
 #
 
-source include/master-slave.inc;
 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;