summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSachin Kumar <sachin.setiya@mariadb.com>2021-04-14 10:56:12 +0100
committerSachin Kumar <sachin.setiya@mariadb.com>2021-05-14 11:29:47 +0100
commit24b84b5fc2c02c1655d14c28b3cd3bb8fef3d2b3 (patch)
tree6c415caccacb8b11d4da84ee25764e5f4c660619
parent95cb022008ecdc8ad6b1a521f3d7df6490271cc9 (diff)
downloadmariadb-git-bb-10.3-sachin-tmp.tar.gz
MDEV-25336 Parallel replication causes failed assert while restartingbb-10.3-sachin-tmp
BackPorting MDEV-20821 and MDEV-22370 fixes the issue, This commit just add test case for it.
-rw-r--r--mysql-test/main/mdev_22370.result1
-rw-r--r--mysql-test/suite/rpl/r/rpl_mdev_25336.result11
-rw-r--r--mysql-test/suite/rpl/t/rpl_mdev_25336.test20
3 files changed, 31 insertions, 1 deletions
diff --git a/mysql-test/main/mdev_22370.result b/mysql-test/main/mdev_22370.result
index c1cb60aa106..d422ee6e81f 100644
--- a/mysql-test/main/mdev_22370.result
+++ b/mysql-test/main/mdev_22370.result
@@ -2,4 +2,3 @@ connect con1,localhost,root,,;
SET DEBUG_DBUG='+d,mark_busy_mdev_22370';
FLUSH TABLES WITH READ LOCK;
connection default;
-# restart
diff --git a/mysql-test/suite/rpl/r/rpl_mdev_25336.result b/mysql-test/suite/rpl/r/rpl_mdev_25336.result
new file mode 100644
index 00000000000..7aca8526328
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_mdev_25336.result
@@ -0,0 +1,11 @@
+include/master-slave.inc
+[connection master]
+connection slave;
+include/stop_slave.inc
+SET GLOBAL slave_parallel_threads=2;
+include/start_slave.inc
+include/rpl_restart_server.inc [server_number=2]
+connection slave;
+SET GLOBAL slave_parallel_threads= 0;
+include/start_slave.inc
+include/rpl_end.inc
diff --git a/mysql-test/suite/rpl/t/rpl_mdev_25336.test b/mysql-test/suite/rpl/t/rpl_mdev_25336.test
new file mode 100644
index 00000000000..c0a122ba5fb
--- /dev/null
+++ b/mysql-test/suite/rpl/t/rpl_mdev_25336.test
@@ -0,0 +1,20 @@
+#
+# MDEV-25336 Parallel replication causes failed assert while restarting
+#
+# This test will restart with parallel slave
+
+--source include/master-slave.inc
+
+--connection slave
+--source include/stop_slave.inc
+--let $old_parallel= `select @@GLOBAL.slave_parallel_threads`
+SET GLOBAL slave_parallel_threads=2;
+--source include/start_slave.inc
+
+--let $rpl_server_no= 2
+--source include/rpl_restart_server.inc
+
+--connection slave
+--eval SET GLOBAL slave_parallel_threads= $old_parallel
+--source include/start_slave.inc
+--source include/rpl_end.inc