MDEV-29943: Check gtid_slave_pos and use sync_with_master_gtid (and remove superfluous semicolons)bb-10.8-MDEV-29934

4 files changed, 17 insertions, 16 deletions

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 b6c28458561..5ce7518cef7 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
@@ -68,6 +68,7 @@ connection server_3;
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
 0	12
+# slave gtid state is 0-1-12
 include/stop_slave.inc
 set global slave_parallel_threads = 0;;
 set global slave_parallel_mode = optimistic;;
diff --git a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
index 0a1c1f7971e..6b10953ca39 100644
--- a/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
+++ b/mysql-test/suite/rpl/r/rpl_start_alter_restart_slave.result
@@ -15,12 +15,12 @@ set global binlog_alter_two_phase=true;
 create table t1( a int primary key, b int) engine=myisam;
 create table t2( a int primary key, b int) engine=myisam;
 connect  con1,localhost,root,,;
-alter table t1 add column c int;;
+alter table t1 add column c int;
 connection master;
 # Get into binlog first and wait
 # master gtid state is 0-1-3
 connect  con2,localhost,root,,;
-alter table t2 add column c int;;
+alter table t2 add column c int;
 connection master;
 # Get into binlog next and wait as well
 # master gtid state is 0-1-4
@@ -53,7 +53,7 @@ master-bin.000001	#	Query	1	#	use `test`; create table t3( a int primary key, b
 connection slave;
 include/sync_with_master_gtid.inc
 connect extra_slave,127.0.0.1,root,,test,$SLAVE_MYPORT;
-stop slave;;
+stop slave;
 connection slave;
 connection extra_slave;
 SET GLOBAL debug_dbug= @old_debug_slave;
@@ -78,8 +78,7 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
 0	5
 include/start_slave.inc
-connection master;
-connection slave;
+include/sync_with_master_gtid.inc
 # Everything from the master binlog must have been applied now:
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 domain_id	seq_no
@@ -111,9 +110,9 @@ SET GLOBAL debug_dbug= @old_debug_master;
 set DEBUG_SYNC= 'RESET';
 connection slave;
 stop slave;
-set global slave_parallel_threads = 0;;
-set global slave_parallel_mode = optimistic;;
-set global gtid_strict_mode = 0;;
+set global slave_parallel_threads = 0;
+set global slave_parallel_mode = optimistic;
+set global gtid_strict_mode = 0;
 set DEBUG_SYNC= 'RESET';
 start slave;
 include/rpl_end.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 2c6f9c0fd72..7c6c35a629f 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,8 @@ select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 
 --connection server_3
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
+--let $slave_gtid_state = `select @@gtid_binlog_state`
+--echo # slave gtid state is $slave_gtid_state
 --source include/stop_slave.inc
 --eval set global slave_parallel_threads = $slave_parallel_threads;
 --eval set global slave_parallel_mode = $slave_parallel_mode;
diff --git a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
index df028ff1820..37b6d472c2e 100644
--- a/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
+++ b/mysql-test/suite/rpl/t/rpl_start_alter_restart_slave.test
@@ -33,7 +33,7 @@ create table t1( a int primary key, b int) engine=myisam;
 create table t2( a int primary key, b int) engine=myisam;
 
 --connect (con1,localhost,root,,)
---send alter table t1 add column c int;
+--send alter table t1 add column c int
 
 --connection master
 --echo # Get into binlog first and wait
@@ -43,7 +43,7 @@ create table t2( a int primary key, b int) engine=myisam;
 --echo # master gtid state is $master_gtid_state
 
 --connect (con2,localhost,root,,)
---send alter table t2 add column c int;
+--send alter table t2 add column c int
 
 --connection master
 --echo # Get into binlog next and wait as well
@@ -75,7 +75,7 @@ create table t3( a int primary key, b int) engine=innodb;
 --source include/sync_with_master_gtid.inc
 # set debug_sync="now wait_for CA_1_processing";
 connect(extra_slave,127.0.0.1,root,,test,$SLAVE_MYPORT);
---send stop slave;
+--send stop slave
 --connection slave
 # set debug_sync="now signal proceed_CA_1";
 --connection extra_slave
@@ -90,8 +90,7 @@ SET GLOBAL debug_dbug= @old_debug_slave;
 
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 --source include/start_slave.inc
---connection master
---sync_slave_with_master
+--source include/sync_with_master_gtid.inc
 --echo # Everything from the master binlog must have been applied now:
 select domain_id, seq_no from mysql.gtid_slave_pos order by seq_no desc limit 1;
 --let $slave_gtid_state = `select @@gtid_binlog_state`
@@ -113,9 +112,9 @@ set DEBUG_SYNC= 'RESET';
 
 --sync_slave_with_master
 stop slave;
---eval set global slave_parallel_threads = $slave_parallel_threads;
---eval set global slave_parallel_mode = $slave_parallel_mode;
---eval set global gtid_strict_mode = $gtid_strict_mode;
+--eval set global slave_parallel_threads = $slave_parallel_threads
+--eval set global slave_parallel_mode = $slave_parallel_mode
+--eval set global gtid_strict_mode = $gtid_strict_mode
 set DEBUG_SYNC= 'RESET';
 start slave;
 --source include/rpl_end.inc