Skip to content

Commit

Permalink
MDEV-32168: slave_error_param condition is never checked from the wai…
Browse files Browse the repository at this point in the history
…t_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>
  • Loading branch information
an3l committed Nov 27, 2023
1 parent 5bb31bc commit 18acf97
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion mysql-test/suite/engines/funcs/r/rpl_server_id1.result
Original file line number Diff line number Diff line change
Expand Up @@ -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;
3 changes: 1 addition & 2 deletions mysql-test/suite/engines/funcs/t/rpl_server_id1.test
Original file line number Diff line number Diff line change
Expand Up @@ -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;

0 comments on commit 18acf97

Please sign in to comment.