sporadic failures of binlog_encryption.rpl_parallel_slave_bgc_kill

do CHANGE MASTER before sync_with_master to have the slave in a predictable fully synced state before the next test
MariaDB · Apr 20, 2024 · a4b6409 · a4b6409
1 parent c7c3967
commit a4b6409
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result b/mysql-test/suite/binlog_encryption/rpl_parallel_slave_bgc_kill.result
@@ -206,10 +206,12 @@ RETURN x;
 END
 ||
 SET sql_log_bin=1;
+include/stop_slave_io.inc
 connection server_1;
 INSERT INTO t3 VALUES (49,0);
 connection server_2;
-START SLAVE SQL_THREAD;
+CHANGE MASTER TO master_use_gtid=no;
+include/start_slave.inc
 SELECT * FROM t3 WHERE a >= 40 ORDER BY a;
 a	b
 41	41
@@ -239,10 +241,6 @@ SET GLOBAL slave_parallel_threads=0;
 SET GLOBAL slave_parallel_threads=10;
 include/start_slave.inc
 *** 3. Same as (2), but not using gtid mode ***
-connection server_2;
-include/stop_slave.inc
-CHANGE MASTER TO master_use_gtid=no;
-include/start_slave.inc
 connection server_1;
 connection con_temp3;
 SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';

diff --git a/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result b/mysql-test/suite/rpl/r/rpl_parallel_slave_bgc_kill.result
@@ -206,10 +206,12 @@ RETURN x;
 END
 ||
 SET sql_log_bin=1;
+include/stop_slave_io.inc
 connection server_1;
 INSERT INTO t3 VALUES (49,0);
 connection server_2;
-START SLAVE SQL_THREAD;
+CHANGE MASTER TO master_use_gtid=no;
+include/start_slave.inc
 SELECT * FROM t3 WHERE a >= 40 ORDER BY a;
 a	b
 41	41
@@ -239,10 +241,6 @@ SET GLOBAL slave_parallel_threads=0;
 SET GLOBAL slave_parallel_threads=10;
 include/start_slave.inc
 *** 3. Same as (2), but not using gtid mode ***
-connection server_2;
-include/stop_slave.inc
-CHANGE MASTER TO master_use_gtid=no;
-include/start_slave.inc
 connection server_1;
 connection con_temp3;
 SET debug_sync='commit_after_release_LOCK_prepare_ordered SIGNAL master_queued1 WAIT_FOR master_cont1';

diff --git a/mysql-test/suite/rpl/t/rpl_parallel_slave_bgc_kill.test b/mysql-test/suite/rpl/t/rpl_parallel_slave_bgc_kill.test
@@ -295,13 +295,14 @@ CREATE FUNCTION foo(x INT, d1 VARCHAR(500), d2 VARCHAR(500))
 ||
 --delimiter ;
 SET sql_log_bin=1;
-
+--source include/stop_slave_io.inc
 --connection server_1
 INSERT INTO t3 VALUES (49,0);
 --save_master_pos
 
 --connection server_2
-START SLAVE SQL_THREAD;
+CHANGE MASTER TO master_use_gtid=no;
+--source include/start_slave.inc
 --sync_with_master
 SELECT * FROM t3 WHERE a >= 40 ORDER BY a;
 # Restore the foo() function.
@@ -334,11 +335,6 @@ SET GLOBAL slave_parallel_threads=10;
 
 --echo *** 3. Same as (2), but not using gtid mode ***
 
---connection server_2
---source include/stop_slave.inc
-CHANGE MASTER TO master_use_gtid=no;
---source include/start_slave.inc
-
 --connection server_1
 # Set up three transactions on the master that will be group-committed
 # together so they can be replicated in parallel on the slave.