mirror of
https://github.com/MariaDB/server.git
synced 2025-08-07 00:04:31 +03:00
fix for post-test check of multi_source.master_info_file
MTR's internal check of the test case 'multi_source.master_info_file' failed. ... -Master_SSL_Verify_Server_Cert No +Master_SSL_Verify_Server_Cert Yes also simplify replace/eval pattern
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=SERVER_MYPORT_1;
|
CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1, master_ssl_verify_server_cert=0;
|
||||||
CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=SERVER_MYPORT_2;
|
CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=$SERVER_MYPORT_2, master_ssl_verify_server_cert=0;
|
||||||
--list_files @@datadir *.info
|
--list_files @@datadir *.info
|
||||||
relay-log-named.info
|
relay-log-named.info
|
||||||
relay-log.info
|
relay-log.info
|
||||||
|
@@ -4,10 +4,8 @@
|
|||||||
# This test sees that `--master-info-file` moves/renames this file.
|
# This test sees that `--master-info-file` moves/renames this file.
|
||||||
|
|
||||||
--source include/not_embedded.inc
|
--source include/not_embedded.inc
|
||||||
--replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1
|
--evalp CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1, master_ssl_verify_server_cert=0
|
||||||
--eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1
|
--evalp CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=$SERVER_MYPORT_2, master_ssl_verify_server_cert=0
|
||||||
--replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2
|
|
||||||
--eval CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=$SERVER_MYPORT_2
|
|
||||||
|
|
||||||
--let $datadir = `SELECT @@datadir`
|
--let $datadir = `SELECT @@datadir`
|
||||||
--echo --list_files @@datadir *.info
|
--echo --list_files @@datadir *.info
|
||||||
|
Reference in New Issue
Block a user