From 0258ad545a27b53c831a4a6498261f4eb2f34657 Mon Sep 17 00:00:00 2001 From: Kristian Nielsen Date: Fri, 17 Nov 2023 17:26:44 +0100 Subject: [PATCH] MDEV-32168: slave_error_param condition is never checked from the wait_for_slave_param.inc Fix wrong change to rpl.rpl_shutdown_wait_slaves. After shutting down the master, slaves may or may not succeed in reconnecting depending on the timing on their reconnect relative to master restart. So don't assume all IO threads will be running, just restart any slave that needs it. Signed-off-by: Kristian Nielsen --- mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc | 4 ---- .../suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result | 3 --- mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result | 3 --- 3 files changed, 10 deletions(-) diff --git a/mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc b/mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc index 964eb3e0262..f9c007b44ab 100644 --- a/mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc +++ b/mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc @@ -80,21 +80,17 @@ DROP TABLE t1; --connection server_2 --disable_warnings --let rpl_allow_error=1 ---source include/wait_for_slave_io_to_start.inc - --source include/start_slave.inc --enable_warnings --connection server_3 --disable_warnings --let rpl_allow_error=1 ---source include/wait_for_slave_io_to_start.inc --source include/start_slave.inc --enable_warnings --connection server_4 --disable_warnings --let rpl_allow_error=1 ---source include/wait_for_slave_io_to_start.inc --source include/start_slave.inc --enable_warnings diff --git a/mysql-test/suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result b/mysql-test/suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result index 6837ca60733..cecc3daf340 100644 --- a/mysql-test/suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result +++ b/mysql-test/suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result @@ -34,13 +34,10 @@ connection server_1; connection server_1; DROP TABLE t1; connection server_2; -include/wait_for_slave_io_to_start.inc include/start_slave.inc connection server_3; -include/wait_for_slave_io_to_start.inc include/start_slave.inc connection server_4; -include/wait_for_slave_io_to_start.inc include/start_slave.inc connection server_2; include/stop_slave.inc diff --git a/mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result b/mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result index f4084bb3ecf..3b238332462 100644 --- a/mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result +++ b/mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result @@ -21,12 +21,9 @@ connection server_1; connection server_1; DROP TABLE t1; connection server_2; -include/wait_for_slave_io_to_start.inc include/start_slave.inc connection server_3; -include/wait_for_slave_io_to_start.inc include/start_slave.inc connection server_4; -include/wait_for_slave_io_to_start.inc include/start_slave.inc include/rpl_end.inc