diff --git a/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc b/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc
index d9ed6f278b9d9..ebb811b1f3bfb 100644
--- a/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc
+++ b/mysql-test/suite/rpl/include/rpl_row_img_sequence.inc
@@ -28,6 +28,9 @@ SELECT SETVAL(s1, 10);
 --source include/save_master_gtid.inc
 
 --echo # Validate SETVAL replicated correctly to other servers
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 --connection server_3
 --source include/sync_with_master_gtid.inc
 --let $diff_tables= server_1:test.s1,server_2:test.s1,server_3:test.s1
@@ -60,6 +63,9 @@ SELECT NEXTVAL(s1);
 --source include/save_master_gtid.inc
 
 --echo # Validate NEXTVAL replicated correctly to other servers
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 --connection server_3
 --source include/sync_with_master_gtid.inc
 --let $diff_tables= server_1:test.s1,server_2:test.s1,server_3:test.s1
@@ -88,5 +94,8 @@ FLUSH LOGS;
 --connection server_1
 DROP TABLE s1;
 --source include/save_master_gtid.inc
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 --connection server_3
 --source include/sync_with_master_gtid.inc
diff --git a/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc b/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc
index 6368336b8e36c..aa67fab9d4011 100644
--- a/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc
+++ b/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc
@@ -34,6 +34,10 @@ CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 --source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
+
 --connection server_3
 --source include/sync_with_master_gtid.inc
 
@@ -127,5 +131,9 @@ FLUSH LOGS;
 DROP TABLE ti,tm;
 --source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
+
 --connection server_3
 --source include/sync_with_master_gtid.inc
diff --git a/mysql-test/suite/rpl/r/rpl_extra_col_slave_rebinlog.result b/mysql-test/suite/rpl/r/rpl_extra_col_slave_rebinlog.result
index 499256e3630b6..1c37bdedb1b45 100644
--- a/mysql-test/suite/rpl/r/rpl_extra_col_slave_rebinlog.result
+++ b/mysql-test/suite/rpl/r/rpl_extra_col_slave_rebinlog.result
@@ -6,6 +6,7 @@ create table t1 (a int) engine=innodb;
 include/save_master_gtid.inc
 connection server_2;
 include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 #
@@ -21,6 +22,7 @@ insert into t1 values (1);
 include/save_master_gtid.inc
 connection server_2;
 include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Slave 3 t1 should match slave 2 t1
@@ -38,6 +40,9 @@ include/diff_tables.inc [server_2:test.t1, server_3:test.t1]
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_master_slave_mismatched_columns_full.result b/mysql-test/suite/rpl/r/rpl_master_slave_mismatched_columns_full.result
index 023f9954282c3..33cf5da3ee1b0 100644
--- a/mysql-test/suite/rpl/r/rpl_master_slave_mismatched_columns_full.result
+++ b/mysql-test/suite/rpl/r/rpl_master_slave_mismatched_columns_full.result
@@ -38,6 +38,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -56,6 +59,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -80,6 +86,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -98,6 +107,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -122,6 +134,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -140,6 +155,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -165,6 +183,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -184,6 +205,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -208,6 +232,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -227,6 +254,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -251,6 +281,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -270,6 +303,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -294,6 +330,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -313,6 +352,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -338,6 +380,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -358,6 +403,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -384,6 +432,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -402,6 +453,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -426,6 +480,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -444,6 +501,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -468,6 +528,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -486,6 +549,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -511,6 +577,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -530,6 +599,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -554,6 +626,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -573,6 +648,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -597,6 +675,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -616,6 +697,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -640,6 +724,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -659,6 +746,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -684,6 +774,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -704,6 +797,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -742,6 +838,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -760,6 +859,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -784,6 +886,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -802,6 +907,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -826,6 +934,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -844,6 +955,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -869,6 +983,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -888,6 +1005,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -912,6 +1032,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -931,6 +1054,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -955,6 +1081,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -974,6 +1103,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -998,6 +1130,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1017,6 +1152,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1042,6 +1180,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1062,6 +1203,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -1088,6 +1232,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1106,6 +1253,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1130,6 +1280,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1148,6 +1301,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1172,6 +1328,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1190,6 +1349,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -1215,6 +1377,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1234,6 +1399,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1258,6 +1426,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1277,6 +1448,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1301,6 +1475,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1320,6 +1497,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1344,6 +1524,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1363,6 +1546,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1388,6 +1574,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1408,6 +1597,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1446,6 +1638,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1464,6 +1659,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1488,6 +1686,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1506,6 +1707,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1530,6 +1734,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1548,6 +1755,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -1573,6 +1783,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1592,6 +1805,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1616,6 +1832,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1635,6 +1854,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1659,6 +1881,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1678,6 +1903,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1702,6 +1930,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1721,6 +1952,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1746,6 +1980,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1766,6 +2003,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -1792,6 +2032,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1810,6 +2053,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1834,6 +2080,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1852,6 +2101,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1876,6 +2128,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1894,6 +2149,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -1919,6 +2177,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1938,6 +2199,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -1962,6 +2226,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -1981,6 +2248,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2005,6 +2275,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2024,6 +2297,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2048,6 +2324,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2067,6 +2346,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2092,6 +2374,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2112,6 +2397,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2150,6 +2438,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2168,6 +2459,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2192,6 +2486,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2210,6 +2507,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2234,6 +2534,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2252,6 +2555,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -2277,6 +2583,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2296,6 +2605,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2320,6 +2632,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2339,6 +2654,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2363,6 +2681,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2382,6 +2703,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2406,6 +2730,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2425,6 +2752,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2450,6 +2780,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2470,6 +2803,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -2496,6 +2832,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2514,6 +2853,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2538,6 +2880,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2556,6 +2901,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2580,6 +2928,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2598,6 +2949,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -2623,6 +2977,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2642,6 +2999,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2666,6 +3026,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2685,6 +3048,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2709,6 +3075,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2728,6 +3097,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2752,6 +3124,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2771,6 +3146,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2796,6 +3174,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2816,6 +3197,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2859,6 +3243,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2877,6 +3264,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2901,6 +3291,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2919,6 +3312,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -2943,6 +3339,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -2961,6 +3360,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -2986,6 +3388,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3005,6 +3410,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3029,6 +3437,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3048,6 +3459,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3072,6 +3486,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3091,6 +3508,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3115,6 +3535,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3134,6 +3557,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3159,6 +3585,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3179,6 +3608,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -3205,6 +3637,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3223,6 +3658,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3247,6 +3685,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3265,6 +3706,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3289,6 +3733,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3307,6 +3754,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -3332,6 +3782,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3351,6 +3804,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3375,6 +3831,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3394,6 +3853,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3418,6 +3880,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3437,6 +3902,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3461,6 +3929,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3480,6 +3951,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3505,6 +3979,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3525,6 +4002,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3563,6 +4043,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3581,6 +4064,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3605,6 +4091,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3623,6 +4112,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3647,6 +4139,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3665,6 +4160,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -3690,6 +4188,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3709,6 +4210,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3733,6 +4237,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3752,6 +4259,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3776,6 +4286,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3795,6 +4308,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3819,6 +4335,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3838,6 +4357,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3863,6 +4385,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3883,6 +4408,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -3909,6 +4437,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3927,6 +4458,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3951,6 +4485,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -3969,6 +4506,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -3993,6 +4533,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4011,6 +4554,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -4036,6 +4582,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4055,6 +4604,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4079,6 +4631,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4098,6 +4653,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4122,6 +4680,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4141,6 +4702,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4165,6 +4729,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4184,6 +4751,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4209,6 +4779,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4229,6 +4802,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4267,6 +4843,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4285,6 +4864,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4309,6 +4891,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4327,6 +4912,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4351,6 +4939,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4369,6 +4960,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -4394,6 +4988,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4413,6 +5010,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4437,6 +5037,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4456,6 +5059,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4480,6 +5086,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4499,6 +5108,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4523,6 +5135,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4542,6 +5157,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4567,6 +5185,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4587,6 +5208,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -4613,6 +5237,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4631,6 +5258,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4655,6 +5285,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4673,6 +5306,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4697,6 +5333,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4715,6 +5354,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -4740,6 +5382,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4759,6 +5404,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4783,6 +5431,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4802,6 +5453,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4826,6 +5480,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4845,6 +5502,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4869,6 +5529,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4888,6 +5551,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4913,6 +5579,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4933,6 +5602,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -4971,6 +5643,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -4989,6 +5664,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5013,6 +5691,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5031,6 +5712,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5055,6 +5739,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5073,6 +5760,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -5098,6 +5788,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5117,6 +5810,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5141,6 +5837,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5160,6 +5859,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5184,6 +5886,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5203,6 +5908,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5227,6 +5935,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5246,6 +5957,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5271,6 +5985,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5291,6 +6008,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -5317,6 +6037,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5335,6 +6058,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5359,6 +6085,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5377,6 +6106,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5401,6 +6133,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5419,6 +6154,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -5444,6 +6182,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5463,6 +6204,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5487,6 +6231,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5506,6 +6253,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5530,6 +6280,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5549,6 +6302,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5573,6 +6329,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5592,6 +6351,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5617,6 +6379,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5637,6 +6402,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5680,6 +6448,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5698,6 +6469,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5722,6 +6496,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5740,6 +6517,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5764,6 +6544,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5782,6 +6565,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -5807,6 +6593,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5826,6 +6615,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5850,6 +6642,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5869,6 +6664,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5893,6 +6691,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5912,6 +6713,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5936,6 +6740,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -5955,6 +6762,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -5980,6 +6790,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6000,6 +6813,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -6026,6 +6842,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6044,6 +6863,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6068,6 +6890,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6086,6 +6911,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6110,6 +6938,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6128,6 +6959,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -6153,6 +6987,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6172,6 +7009,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6196,6 +7036,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6215,6 +7058,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6239,6 +7085,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6258,6 +7107,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6282,6 +7134,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6301,6 +7156,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6326,6 +7184,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6346,6 +7207,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6384,6 +7248,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6402,6 +7269,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6426,6 +7296,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6444,6 +7317,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6468,6 +7344,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6486,6 +7365,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -6511,6 +7393,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6530,6 +7415,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6554,6 +7442,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6573,6 +7464,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6597,6 +7491,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6616,6 +7513,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6640,6 +7540,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6659,6 +7562,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6684,6 +7590,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6704,6 +7613,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -6730,6 +7642,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6748,6 +7663,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6772,6 +7690,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6790,6 +7711,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6814,6 +7738,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6832,6 +7759,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -6857,6 +7787,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6876,6 +7809,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6900,6 +7836,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6919,6 +7858,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6943,6 +7885,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -6962,6 +7907,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -6986,6 +7934,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7005,6 +7956,9 @@ NULL	aaa	2000
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7030,6 +7984,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = NULL WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7050,6 +8007,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7088,6 +8048,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7106,6 +8069,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7130,6 +8096,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7148,6 +8117,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7172,6 +8144,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7190,6 +8165,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -7215,6 +8193,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7234,6 +8215,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7258,6 +8242,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7277,6 +8264,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7301,6 +8291,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7320,6 +8313,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7344,6 +8340,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7363,6 +8362,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7388,6 +8390,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7408,6 +8413,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -7434,6 +8442,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7452,6 +8463,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7476,6 +8490,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7494,6 +8511,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7518,6 +8538,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7536,6 +8559,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -7561,6 +8587,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7580,6 +8609,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7604,6 +8636,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7623,6 +8658,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7647,6 +8685,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7666,6 +8707,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7690,6 +8734,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7709,6 +8756,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7734,6 +8784,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, NULL, 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7754,6 +8807,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7792,6 +8848,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7810,6 +8869,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7834,6 +8896,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7852,6 +8917,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7876,6 +8944,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7894,6 +8965,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -7919,6 +8993,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7938,6 +9015,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -7962,6 +9042,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -7981,6 +9064,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8005,6 +9091,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8024,6 +9113,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8048,6 +9140,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8067,6 +9162,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8092,6 +9190,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8112,6 +9213,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Simple type conversion
@@ -8138,6 +9242,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8156,6 +9263,9 @@ new_col	pk	a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8180,6 +9290,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8198,6 +9311,9 @@ pk	a	new_col	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8222,6 +9338,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8240,6 +9359,9 @@ pk	a	b	c	new_col
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # ALTER DROP COLUMN tests
@@ -8265,6 +9387,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8284,6 +9409,9 @@ pk	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8308,6 +9436,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8327,6 +9458,9 @@ pk	a	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8351,6 +9485,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8370,6 +9507,9 @@ pk	a	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8394,6 +9534,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8413,6 +9556,9 @@ a	b	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8438,6 +9584,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', NULL);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8458,6 +9607,9 @@ pk	b
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_2;
@@ -8489,6 +9641,9 @@ connection server_1;
 INSERT INTO t1 (pk, a, b, c) VALUES(1, 999, 'aaa', 2000);
 UPDATE t1 set a = 1000 WHERE pk = 1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 # Ensure server_2 and server_3 are consistent with one another..
@@ -8508,6 +9663,9 @@ pk	a	new_col	c
 connection server_1;
 drop table t1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 #
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
index 2303911637f78..4dd186db922e2 100644
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
@@ -53,6 +53,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -90,6 +93,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -124,6 +130,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, MyISAM, InnoDB
@@ -144,6 +153,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -181,6 +193,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -215,6 +230,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, MyISAM
@@ -235,6 +253,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -272,6 +293,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -306,6 +330,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, InnoDB
@@ -326,6 +353,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -363,6 +393,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -397,6 +430,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, MyISAM
@@ -417,6 +453,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -454,6 +493,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -488,6 +530,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, InnoDB
@@ -508,6 +553,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -545,6 +593,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -579,6 +630,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, MyISAM
@@ -599,6 +653,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -636,6 +693,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -670,6 +730,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, InnoDB
@@ -690,6 +753,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -727,6 +793,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -761,6 +830,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full_nodup.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full_nodup.result
index c6afb2ecb7e32..068e0f5df1222 100644
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_full_nodup.result
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_full_nodup.result
@@ -53,6 +53,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -90,6 +93,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -124,6 +130,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, MyISAM, InnoDB
@@ -144,6 +153,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -181,6 +193,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -215,6 +230,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, MyISAM
@@ -235,6 +253,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -272,6 +293,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -306,6 +330,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, InnoDB
@@ -326,6 +353,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -363,6 +393,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -397,6 +430,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, MyISAM
@@ -417,6 +453,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -454,6 +493,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -488,6 +530,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, InnoDB
@@ -508,6 +553,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -545,6 +593,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -579,6 +630,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, MyISAM
@@ -599,6 +653,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -636,6 +693,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -670,6 +730,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, InnoDB
@@ -690,6 +753,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -727,6 +793,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -761,6 +830,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
index eaf770f245c92..b387742d5499c 100644
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
@@ -54,6 +54,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -91,6 +94,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -125,6 +131,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, MyISAM, InnoDB
@@ -145,6 +154,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -182,6 +194,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -216,6 +231,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, MyISAM
@@ -236,6 +254,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -273,6 +294,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -307,6 +331,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, InnoDB
@@ -327,6 +354,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -364,6 +394,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -398,6 +431,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, MyISAM
@@ -418,6 +454,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -455,6 +494,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -489,6 +531,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, InnoDB
@@ -509,6 +554,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -546,6 +594,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -580,6 +631,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, MyISAM
@@ -600,6 +654,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -637,6 +694,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -671,6 +731,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, InnoDB
@@ -691,6 +754,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -728,6 +794,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -762,6 +831,9 @@ include/ensure_binlog_row_event_columns.inc [(1,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
diff --git a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
index 496bd8dc6b886..8ca8ea3e3f80b 100644
--- a/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
+++ b/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
@@ -53,6 +53,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -90,6 +93,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -124,6 +130,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, MyISAM, InnoDB
@@ -144,6 +153,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -181,6 +193,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -215,6 +230,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, MyISAM
@@ -235,6 +253,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -272,6 +293,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -306,6 +330,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: MyISAM, InnoDB, InnoDB
@@ -326,6 +353,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -363,6 +393,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -397,6 +430,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, MyISAM
@@ -417,6 +453,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -454,6 +493,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -488,6 +530,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, MyISAM, InnoDB
@@ -508,6 +553,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -545,6 +593,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -579,6 +630,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, MyISAM
@@ -599,6 +653,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -636,6 +693,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -670,6 +730,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 ### engines: InnoDB, InnoDB, InnoDB
@@ -690,6 +753,9 @@ SETVAL(s1, 10)
 10
 include/save_master_gtid.inc
 # Validate SETVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -727,6 +793,9 @@ NEXTVAL(s1)
 11
 include/save_master_gtid.inc
 # Validate NEXTVAL replicated correctly to other servers
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/diff_tables.inc [server_1:test.s1,server_2:test.s1,server_3:test.s1]
@@ -761,6 +830,9 @@ include/ensure_binlog_row_event_columns.inc [(1,2,3,4,5,6,7,8)]
 connection server_1;
 DROP TABLE s1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 CON: 'server_1', IMG: 'FULL', RESTART SLAVE: 'N'
diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
index efe4cfa0a698f..9e92b921bf8df 100644
--- a/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
+++ b/mysql-test/suite/rpl/r/rpl_start_alter_chain_basic.result
@@ -66,6 +66,9 @@ domain_id	seq_no
 0	12
 connection server_1;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
diff --git a/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result b/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result
index 917041c148d23..37b0b06d22250 100644
--- a/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result
+++ b/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result
@@ -13,6 +13,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -37,6 +40,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -46,6 +52,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -77,6 +86,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -86,6 +98,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -110,6 +125,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -119,6 +137,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -150,6 +171,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 #
@@ -162,6 +186,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -188,6 +215,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -197,6 +227,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -230,6 +263,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -239,6 +275,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -265,6 +304,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -274,6 +316,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -307,6 +352,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 #
@@ -323,6 +371,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -349,6 +400,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -358,6 +412,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -391,6 +448,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -400,6 +460,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -428,6 +491,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -437,6 +503,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -470,6 +539,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -485,6 +557,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -513,6 +588,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -522,6 +600,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -557,6 +638,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -566,6 +650,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -594,6 +681,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -603,6 +693,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -638,6 +731,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 #
@@ -655,6 +751,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -683,6 +782,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -692,6 +794,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -727,6 +832,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -736,6 +844,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -766,6 +877,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -775,6 +889,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -810,6 +927,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -830,6 +950,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -858,6 +981,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -867,6 +993,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -902,6 +1031,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -911,6 +1043,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -941,6 +1076,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -950,6 +1088,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -985,6 +1126,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1004,6 +1148,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1032,6 +1179,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1041,6 +1191,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1076,6 +1229,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1085,6 +1241,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1115,6 +1274,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1124,6 +1286,9 @@ connection server_1;
 CREATE TABLE tm (a INT PRIMARY KEY) engine=myisam;
 CREATE TABLE ti (a INT PRIMARY KEY) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1159,6 +1324,9 @@ include/assert_grep.inc [server_3 should not binlog XA transaction]
 connection server_1;
 DROP TABLE ti,tm;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 connection server_1;
@@ -1173,6 +1341,9 @@ create database db1;
 create database db2;
 create table db1.t1 (a int) engine=innodb;
 include/save_master_gtid.inc
+connection server_2;
+include/sync_with_master_gtid.inc
+include/save_master_gtid.inc
 connection server_3;
 include/sync_with_master_gtid.inc
 include/stop_slave.inc
diff --git a/mysql-test/suite/rpl/t/rpl_extra_col_slave_rebinlog.test b/mysql-test/suite/rpl/t/rpl_extra_col_slave_rebinlog.test
index 455ea3f4fde94..70d8381d3222e 100644
--- a/mysql-test/suite/rpl/t/rpl_extra_col_slave_rebinlog.test
+++ b/mysql-test/suite/rpl/t/rpl_extra_col_slave_rebinlog.test
@@ -17,6 +17,7 @@ create table t1 (a int) engine=innodb;
 
 --connection server_2
 --source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 
 --connection server_3
 --source include/sync_with_master_gtid.inc
@@ -37,6 +38,7 @@ insert into t1 values (1);
 
 --connection server_2
 --source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 
 --connection server_3
 --source include/sync_with_master_gtid.inc
@@ -55,6 +57,10 @@ select * from t1;
 drop table t1;
 --source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
+
 --connection server_3
 --source include/sync_with_master_gtid.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_master_slave_mismatched_columns_full.inc b/mysql-test/suite/rpl/t/rpl_master_slave_mismatched_columns_full.inc
index 961c8ef086dd2..79191f305bad6 100644
--- a/mysql-test/suite/rpl/t/rpl_master_slave_mismatched_columns_full.inc
+++ b/mysql-test/suite/rpl/t/rpl_master_slave_mismatched_columns_full.inc
@@ -116,6 +116,10 @@ eval INSERT INTO t1 (pk, a, b, c) VALUES($master_pk, $master_a_pre, $master_b, $
 eval UPDATE t1 set a = $master_a WHERE pk = $master_pk;
 --source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
+
 --connection server_3
 --source include/sync_with_master_gtid.inc
 
@@ -195,5 +199,9 @@ if (!$can_convert) {
 drop table t1;
 --source include/save_master_gtid.inc
 
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
+
 --connection server_3
 --source include/sync_with_master_gtid.inc
diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
index efb667ad6fad0..7918e517b4d42 100644
--- a/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
+++ b/mysql-test/suite/rpl/t/rpl_start_alter_chain_basic.test
@@ -41,6 +41,9 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 
 --connection server_1
 --source include/save_master_gtid.inc
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 --connection server_3
 --source include/sync_with_master_gtid.inc
 
diff --git a/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test b/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test
index 85b6bcdb87397..166e3829e9fd5 100644
--- a/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test
+++ b/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test
@@ -187,6 +187,9 @@ create database db1;
 create database db2;
 create table db1.t1 (a int) engine=innodb;
 --source include/save_master_gtid.inc
+--connection server_2
+--source include/sync_with_master_gtid.inc
+--source include/save_master_gtid.inc
 --connection server_3
 --source include/sync_with_master_gtid.inc
 --source include/stop_slave.inc