WL#7205 - Make the MTR rpl suite GTID_MODE agnostic

                  
This worklog aims at making the MTR rpl suite GTID_MODE
agnostic, so that we can have run it daily on pushbuild with
--gtid-mode=ON.

Author: Manish Kumar

mysql-test/collections/default.daily

@@ -19,6 +19,10 @@ perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experime
 # Additional modes for rpl. Multi-Threaded Slave
 perl mysql-test-run.pl --timer --debug-server --force --parallel=auto --comment=rpl_MTS-debug --vardir=var-mts-rpl-debug --experimental=collections/default.experimental --mysqld=--slave-parallel-workers=4 --mysqld=--slave-transaction-retries=0 --suite=rpl
 
+# Additional GTID coverage (rpl suite with gtid_mode=ON)
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_gtid-debug --vardir=var-rpl_gtid-debug --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list
+
+
 # Additional GTID coverage (binlog suite with gtid_mode=ON)
 perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=binlog_gtid-debug --vardir=var-binlog_gtid-debug --suite=binlog --mysqld=--binlog-checksum=CRC32 --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list
 

mysql-test/collections/default.weekly

@@ -47,6 +47,8 @@ perl mysql-test-run.pl --timer --force --debug-server --comment=memcached-debug
 # Non debug runs of default suites in normal modes
 perl mysql-test-run.pl --force --timer   --parallel=auto --experimental=collections/default.experimental --comment=normal-non-debug  --vardir=var-normal-non-debug --report-features --skip-test-list=collections/disabled-weekly.list
 
+# Additional GTID coverage (rpl suite with gtid_mode=ON)
+perl mysql-test-run.pl --force --timer --debug-server --parallel=auto --experimental=collections/default.experimental --comment=rpl_gtid-debug --vardir=var-rpl_gtid-debug --suite=rpl --mysqld=--enforce-gtid-consistency --mysqld=--log-slave-updates --mysqld=--gtid-mode=on --skip-test-list=collections/disabled-gtid-on.list --big-test --testcase-timeout=60 --suite-timeout=360
 
 
 # Multi-Thread Slave

mysql-test/collections/disabled-gtid-on.list

@@ -3,3 +3,4 @@ binlog.binlog_variables_relay_log              : No need to test. Binary log off
 binlog.binlog_base64_flag                      : No need to test. Binary log off.
 binlog.binlog_hexdump                          : No need to test. Binary log off.
 binlog.binlog_old_versions                     : No need to test. Binary log off.
+rpl.rpl_server_uuid                            : No need to test. Non-transactional tables involved.

mysql-test/extra/rpl_tests/rpl_auto_increment.test

@@ -8,7 +8,7 @@ eval create table t1 (a int not null auto_increment,b int, primary key (a)) engi
 insert into t1 values (NULL,1),(NULL,2),(NULL,3);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -19,7 +19,7 @@ delete from t1 where b=4;
 insert into t1 values (NULL,5),(NULL,6);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 
@@ -38,7 +38,7 @@ set @@insert_id=400;
 insert into t1 values(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -56,7 +56,7 @@ set @@insert_id=400;
 insert into t1 values(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -74,7 +74,7 @@ set @@insert_id=600;
 insert ignore into t1 values(600),(NULL),(NULL),(610),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 connection master;
 drop table t1;
@@ -86,15 +86,15 @@ set @@session.auto_increment_increment=10, @@session.auto_increment_offset=1;
 
 eval create table t1 (a int not null auto_increment, primary key (a)) engine=$engine_type2;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 insert into t1 values(2),(12),(22),(32),(42);
 connection master;
 
 insert into t1 values (NULL),(NULL);
 insert into t1 values (3),(NULL),(NULL);
 select * from t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 
 # Test for BUG#20524 "auto_increment_* not observed when inserting
@@ -129,15 +129,15 @@ set auto_increment_increment=1000;
 set auto_increment_offset=700;
 insert into t3 values(null);
 select * from t3 order by a;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1 order by a;
 select * from t2 order by a;
 select * from t3 order by a;
 
 connection master;
 
 drop table t1,t2,t3;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#41986 Replication slave does not pick up proper AUTO_INCREMENT value for Innodb tables
@@ -149,7 +149,7 @@ CREATE TABLE t1 (id MEDIUMINT NOT NULL AUTO_INCREMENT PRIMARY KEY) ENGINE=innodb
 INSERT INTO t1 VALUES (NULL), (NULL), (NULL);
 show create table t1;
 
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 show create table t1;
 
 connection master;
@@ -200,7 +200,7 @@ SELECT * FROM t2;
 INSERT INTO t1 VALUES(4);
 INSERT INTO t2 VALUES(4);
 FLUSH LOGS;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
@@ -211,7 +211,7 @@ source include/diff_tables.inc;
 connection master;
 DROP TABLE t1;
 DROP TABLE t2;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 connection master;
 let $MYSQLD_DATADIR= `SELECT @@DATADIR`;
@@ -230,7 +230,7 @@ connection slave;
 source include/start_slave.inc;
 connection master;
 --exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.saved | $MYSQL test
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 let $diff_tables= master:t1, slave:t1;
 source include/diff_tables.inc;
@@ -243,7 +243,7 @@ source include/diff_tables.inc;
 DROP TABLE t1;
 DROP TABLE t2;
 SET SQL_MODE='';
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # BUG#56662
@@ -263,12 +263,12 @@ INSERT INTO t1(id,data) VALUES(0,2);
 SET SQL_MODE=0;
 COMMIT;
 SELECT * FROM t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 SELECT * FROM t1;
 
 connection master;
 DROP TABLE t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 #
 # WL#5872 "avoid using global heap memory to remember autoincrement
@@ -277,12 +277,12 @@ sync_slave_with_master;
 connection master;
 eval create table t1(a int auto_increment primary key) engine=$engine_type;
 insert into t1 values (null),(null),(1025),(null);
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 select * from t1;
 let $diff_tables= master:t1, slave:t1;
 --source include/diff_tables.inc
 connection master;
 drop table t1;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 --source include/rpl_end.inc

mysql-test/extra/rpl_tests/rpl_auto_increment_insert_view.test

@@ -26,7 +26,7 @@ connection master;
 INSERT INTO v16(c1) VALUES (23), (24);
 INSERT INTO v16(c1) VALUES (25), (26);
 commit;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'INSERT DATA INTO VIEW WHICH INVOKES TRIGGERS'
 let $diff_tables= master:t3, slave:t3;
@@ -37,7 +37,7 @@ DROP TABLE t1;
 DROP TABLE t2;
 DROP TABLE t3;
 DROP VIEW  v16;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 
 
 

mysql-test/extra/rpl_tests/rpl_auto_increment_invoke_trigger.test

@@ -57,7 +57,7 @@ source include/show_binlog_events.inc;
 commit;
 
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'INVOKES A TRIGGER with $trigger_action action'
 let $diff_tables= master:t2, slave:t2;
@@ -75,5 +75,5 @@ DROP TABLE t4;
 DROP TABLE t5;
 DROP TABLE t6;
 DROP FUNCTION f1_insert_triggered;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 

mysql-test/extra/rpl_tests/rpl_autoinc_func_invokes_trigger.test

@@ -38,7 +38,7 @@ source include/show_binlog_events.inc;
 commit;
 
 connection master;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc
 --echo #Test if the results are consistent on master and slave
 --echo #for 'CALLS A FUNCTION which INVOKES A TRIGGER with $insert_action action'
 let $diff_tables= master:t2, slave:t2;
@@ -51,5 +51,5 @@ drop table t1;
 drop table t2;
 drop table t3;
 drop function f1_two_inserts_trigger;
-sync_slave_with_master;
+--source include/sync_slave_sql_with_master.inc