Skip to content

Commit 18acf97

Browse files
committed
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 d8e448b): 1) Record test `rpl_row_until` from commit d95fa7e 2) Record test `rpl_slave_status` from commit a7d186a - Stop only running threads for `engines/funcs.rpl_server_id1.test` that is not the same as `rpl.rpl_server_id1.test` - Reviewer: <knielsen@knielsen-hq.org> <andrei.elkin@mariadb.com>
1 parent 5bb31bc commit 18acf97

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

mysql-test/suite/engines/funcs/r/rpl_server_id1.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ insert into t1 values (1);
1515
include/wait_for_slave_param.inc [Last_IO_Errno]
1616
Last_IO_Errno = '1593'
1717
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).'
18-
include/stop_slave.inc
18+
include/stop_slave_sql.inc
1919
reset slave;
2020
reset master;
2121
drop table t1;

mysql-test/suite/engines/funcs/t/rpl_server_id1.test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@ insert into t1 values (1);
2525
--let $status_items= Last_IO_Errno, Last_IO_Error
2626
--source include/show_slave_status.inc
2727

28-
--let $rpl_only_running_threads= 1
29-
--source include/stop_slave.inc
28+
--source include/stop_slave_sql.inc
3029
reset slave;
3130
reset master;
3231
drop table t1;

0 commit comments

Comments
 (0)