Commit 7e394d0b authored by Kristian Nielsen's avatar Kristian Nielsen

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

Fix sporadic test failure in rpl.rpl_ssl1. The test incorrectly did a STOP
SLAVE too early, which could race with the expected 'Access denied' error.
Signed-off-by: default avatarKristian Nielsen <knielsen@knielsen-hq.org>
parent 30ec1b3e
...@@ -14,8 +14,8 @@ insert into t1 values (1); ...@@ -14,8 +14,8 @@ insert into t1 values (1);
connection slave; connection slave;
select * from t1; select * from t1;
t t
stop slave;
include/wait_for_slave_io_error.inc [errno=1045] include/wait_for_slave_io_error.inc [errno=1045]
include/stop_slave_sql.inc
change master to master_ssl=1 , master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem'; change master to master_ssl=1 , master_ssl_ca ='MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='MYSQL_TEST_DIR/std_data/client-key.pem';
start slave; start slave;
include/wait_for_slave_to_start.inc include/wait_for_slave_to_start.inc
......
...@@ -29,9 +29,9 @@ connection slave; ...@@ -29,9 +29,9 @@ connection slave;
select * from t1; select * from t1;
#showing that replication could work with ssl params #showing that replication could work with ssl params
stop slave;
--let $slave_io_errno=1045 --let $slave_io_errno=1045
--source include/wait_for_slave_io_error.inc --source include/wait_for_slave_io_error.inc
--source include/stop_slave_sql.inc
--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR --replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
eval change master to master_ssl=1 , master_ssl_ca ='$MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='$MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='$MYSQL_TEST_DIR/std_data/client-key.pem'; eval change master to master_ssl=1 , master_ssl_ca ='$MYSQL_TEST_DIR/std_data/cacert.pem', master_ssl_cert='$MYSQL_TEST_DIR/std_data/client-cert.pem', master_ssl_key='$MYSQL_TEST_DIR/std_data/client-key.pem';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment