From 18acf97dfdd089a16fe78e606f9871bac92ccfb5 Mon Sep 17 00:00:00 2001 From: Anel Husakovic Date: Wed, 22 Nov 2023 22:41:28 +0100 Subject: [PATCH] MDEV-32168: slave_error_param condition is never checked from the wait_for_slave_param.inc - Record unrecorded tests from `rpl` suite to `engines/funcs` suite (done by d8e448ba1b8834bcf3e358ab7b0a369eeff993ba): 1) Record test `rpl_row_until` from commit d95fa7e33279c6c6849eb053d85f1faa1c77e269 2) Record test `rpl_slave_status` from commit a7d186a17d35b2651f3ebee8aa3e49b68ded4d64 - Stop only running threads for `engines/funcs.rpl_server_id1.test` that is not the same as `rpl.rpl_server_id1.test` - Reviewer: --- mysql-test/suite/engines/funcs/r/rpl_server_id1.result | 2 +- mysql-test/suite/engines/funcs/t/rpl_server_id1.test | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/engines/funcs/r/rpl_server_id1.result b/mysql-test/suite/engines/funcs/r/rpl_server_id1.result index 001d1151843..6f64faba5fa 100644 --- a/mysql-test/suite/engines/funcs/r/rpl_server_id1.result +++ b/mysql-test/suite/engines/funcs/r/rpl_server_id1.result @@ -15,7 +15,7 @@ insert into t1 values (1); include/wait_for_slave_param.inc [Last_IO_Errno] Last_IO_Errno = '1593' Last_IO_Error = 'Fatal error: The slave I/O thread stops because master and slave have equal MySQL server ids; these ids must be different for replication to work (or the --replicate-same-server-id option must be used on slave but this does not always make sense; please check the manual before using it).' -include/stop_slave.inc +include/stop_slave_sql.inc reset slave; reset master; drop table t1; diff --git a/mysql-test/suite/engines/funcs/t/rpl_server_id1.test b/mysql-test/suite/engines/funcs/t/rpl_server_id1.test index d0ac3b67108..8f0248ebbde 100644 --- a/mysql-test/suite/engines/funcs/t/rpl_server_id1.test +++ b/mysql-test/suite/engines/funcs/t/rpl_server_id1.test @@ -25,8 +25,7 @@ insert into t1 values (1); --let $status_items= Last_IO_Errno, Last_IO_Error --source include/show_slave_status.inc ---let $rpl_only_running_threads= 1 ---source include/stop_slave.inc +--source include/stop_slave_sql.inc reset slave; reset master; drop table t1;