Skip to content

Commit 1053630

Browse files
committed
MDEV-39413 wsrep unsafe handling of parameters
When server is started with unsafe parameter --exec could return also error 134. Furthermore, --exed pkill could return error 15. Added these error codes as accepted.
1 parent c99c705 commit 1053630

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

mysql-test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key_server.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ call mtr.add_suppression('Removing .*/xtrabackup_galera_info file due to signal'
4545
--exec echo ssl-key=$MYSQL_TEST_DIR/std_data/server-new-key.pem >> $MYSQLTEST_VARDIR/my.cnf
4646

4747
--echo # start the server
48-
--error 0
48+
--error 0,134
4949
--exec $MYSQLD_LAST_CMD
5050
--echo # the server failed to start
5151

@@ -55,6 +55,7 @@ call mtr.add_suppression('Removing .*/xtrabackup_galera_info file due to signal'
5555
--echo # cleanup
5656
# we have to kill joiner's socat here, because the donor has aborted SST
5757
# and joiner's socat will timeout in 5 minutes
58+
--error 0,15
5859
--exec pkill -f 'socat.*server-new-cert'
5960
--exec echo ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem >> $MYSQLTEST_VARDIR/my.cnf
6061
--exec echo ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem >> $MYSQLTEST_VARDIR/my.cnf

0 commit comments

Comments
 (0)