Merge branch '10.0' into 10.1

mysql-test/extra/rpl_tests/rpl_cant_read_event_incident.inc

@@ -18,8 +18,8 @@
 # and replication is started from it.
 #
 
---source include/master-slave.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 --connection slave
 # Make sure the slave is stopped while we are messing with master.

mysql-test/extra/rpl_tests/rpl_checksum.inc

@@ -7,9 +7,9 @@
 # WL2540 replication events checksum
 # Testing configuration parameters
 
---source include/master-slave.inc
 --source include/have_debug.inc
 --source include/have_binlog_format_mixed.inc
+--source include/master-slave.inc
 
 call mtr.add_suppression('Slave can not handle replication events with the checksum that master is configured to log');
 call mtr.add_suppression('Replication event checksum verification failed');

mysql-test/extra/rpl_tests/rpl_incident.inc

@@ -4,8 +4,8 @@
 # Please check all dependent tests after modifying it
 #
 
---source include/master-slave.inc
 --source include/have_debug.inc
+--source include/master-slave.inc
 
 --echo **** On Master ****
 CREATE TABLE t1 (a INT);

mysql-test/extra/rpl_tests/rpl_init_slave_errors.inc

@@ -35,8 +35,8 @@
 #                    Configuring the Environment
 ######################################################################
 source include/have_debug.inc;
-source include/master-slave.inc;
 source include/have_log_bin.inc;
+source include/master-slave.inc;
 
 connection slave;
 

mysql-test/extra/rpl_tests/rpl_loaddata.test

@@ -11,8 +11,8 @@
 # check if START SLAVE, RESET SLAVE, CHANGE MASTER reset Last_slave_error and
 # Last_slave_errno in SHOW SLAVE STATUS (1st and 3rd commands did not: bug 986)
 
--- source include/master-slave.inc
 source include/have_innodb.inc;
+source include/master-slave.inc;
 
 --disable_query_log
 CALL mtr.add_suppression("Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT");

mysql-test/extra/rpl_tests/rpl_packet.inc

@@ -15,8 +15,9 @@
 # BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKET
 
 # max-out size db name 
-source include/master-slave.inc;
 source include/have_binlog_format_row.inc;
+source include/master-slave.inc;
+
 call mtr.add_suppression("Slave I/O: Got a packet bigger than 'slave_max_allowed_packet' bytes, .*error.* 1153");
 call mtr.add_suppression("Log entry on master is longer than slave_max_allowed_packet");
 let $db= DB_NAME_OF_MAX_LENGTH_AKA_NAME_LEN_64_BYTES_____________________;

mysql-test/extra/rpl_tests/rpl_skip_replication.inc

@@ -16,8 +16,8 @@
 # so if it is needed, it should be set explicitly before each call.
 #
 
---source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 
 connection slave;
 # Test that SUPER is required to change @@replicate_events_marked_for_skip.

mysql-test/extra/rpl_tests/rpl_stm_relay_ign_space.inc

@@ -25,8 +25,8 @@
 # IO thread does not do it in an uncontrolled manner.
 
 --source include/have_binlog_format_statement.inc
---source include/master-slave.inc
 --source include/have_innodb.inc
+--source include/master-slave.inc
 
 --disable_query_log
 CREATE TABLE t1 (c1 TEXT) engine=InnoDB;

mysql-test/extra/rpl_tests/rpl_sync.inc

@@ -32,12 +32,12 @@
 #                                Configuring the environment
 ########################################################################################
 --echo =====Configuring the enviroment=======;
---source include/master-slave.inc
 --source include/not_embedded.inc
 --source include/not_valgrind.inc
 --source include/have_debug.inc
 --source include/have_innodb.inc
 --source include/not_crashrep.inc
+--source include/master-slave.inc
 
 call mtr.add_suppression('Attempting backtrace');
 call mtr.add_suppression("Recovery from master pos .* and file master-bin.000001");