database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-32168: slave_error_param condition is never checked from the wait_for_slave_param.inc

Browse Source 
Fix sporadic test failures in rpl.rpl_set_statement_default_master and
rpl.rpl_slave_load_tmpdir_not_exist. A race between START and STOP
SLAVE could leave an error condition that causes test failure after
MDEV-32168.

Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
Kristian Nielsen
2023-11-17 16:35:04 +01:00
parent 17430d94d7
commit 30ec1b3e78
4 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/suite/rpl/r/rpl_set_statement_default_master.result
View File

@@ -14,6 +14,7 @@ RESET SLAVE ALL;
CHANGE MASTER 'm1' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_USER='root'; CHANGE MASTER 'm1' TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_MYPORT, MASTER_USER='root';
SET STATEMENT default_master_connection = 'm1' FOR START SLAVE; SET STATEMENT default_master_connection = 'm1' FOR START SLAVE;
set default_master_connection = 'm1'; set default_master_connection = 'm1';
include/wait_for_slave_to_start.inc
stop slave; stop slave;
include/wait_for_slave_to_stop.inc include/wait_for_slave_to_stop.inc
reset slave all; reset slave all;

1
mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
View File

@@ -4,6 +4,7 @@ connection slave;
START SLAVE; START SLAVE;
call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory"); call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory");
include/wait_for_slave_sql_error.inc [errno=12] include/wait_for_slave_sql_error.inc [errno=12]
include/wait_for_slave_io_to_start.inc
include/stop_slave_io.inc include/stop_slave_io.inc
RESET SLAVE; RESET SLAVE;
include/rpl_end.inc include/rpl_end.inc

1
mysql-test/suite/rpl/t/rpl_set_statement_default_master.test
View File

@@ -26,6 +26,7 @@ eval CHANGE MASTER 'm1' TO MASTER_HOST='127.0.0.1', MASTER_PORT=$MASTER_MYPORT,
SET STATEMENT default_master_connection = 'm1' FOR START SLAVE; SET STATEMENT default_master_connection = 'm1' FOR START SLAVE;
set default_master_connection = 'm1'; set default_master_connection = 'm1';
--source include/wait_for_slave_to_start.inc
stop slave; stop slave;
--source include/wait_for_slave_to_stop.inc --source include/wait_for_slave_to_stop.inc
reset slave all; reset slave all;

1
mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
View File

@@ -15,6 +15,7 @@ call mtr.add_suppression("Slave SQL.*Unable to use slave.s temporary directory")
--let $slave_sql_errno= 12 --let $slave_sql_errno= 12
source include/wait_for_slave_sql_error.inc; source include/wait_for_slave_sql_error.inc;
--source include/wait_for_slave_io_to_start.inc
--source include/stop_slave_io.inc --source include/stop_slave_io.inc
RESET SLAVE; RESET SLAVE;