summaryrefslogtreecommitdiff
path: root/mysql-test/suite/rpl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-02-28 13:17:09 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-02-28 13:17:09 +0200
commitcc1d90621139eb04cdc9d65650b4718344db2425 (patch)
treebc60e7cf1a85a769247996dc05ea96bcf720e48e /mysql-test/suite/rpl
parentb791b942e1c04113c65cb7d3eaaf3cae8963efee (diff)
parent3c58cdd91d86aa03d3a5204dbfea5948810e8bc9 (diff)
downloadmariadb-git-cc1d90621139eb04cdc9d65650b4718344db2425.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/suite/rpl')
-rw-r--r--mysql-test/suite/rpl/t/rpl_dump_request_retry_warning.test6
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_dump_request_retry_warning.test b/mysql-test/suite/rpl/t/rpl_dump_request_retry_warning.test
index d750d44ae71..1ee043623ae 100644
--- a/mysql-test/suite/rpl/t/rpl_dump_request_retry_warning.test
+++ b/mysql-test/suite/rpl/t/rpl_dump_request_retry_warning.test
@@ -43,6 +43,12 @@ START SLAVE;
SET DEBUG_SYNC= 'now WAIT_FOR parked';
SET @@GLOBAL.debug_dbug = @saved_dbug;
SET DEBUG_SYNC= 'now SIGNAL continue';
+
+# Ensure the last DEBUG_SYNC signal was received by the target thread before
+# reset; otherwise, the reset can drop the last signal before it gets
+# acknowledged
+let $wait_condition= select count(*)=0 from information_schema.processlist where state like "%debug%";
+source include/wait_condition.inc;
SET DEBUG_SYNC= 'RESET';
--source include/wait_for_slave_io_to_start.inc