From fb43b0dc3daf41efa27ec60d5db4ad426a312075 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 18 Apr 2025 09:41:12 +0200 Subject: [PATCH] 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 --- mysql-test/suite/multi_source/master_info_file.result | 4 ++-- mysql-test/suite/multi_source/master_info_file.test | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/multi_source/master_info_file.result b/mysql-test/suite/multi_source/master_info_file.result index 08fe34677be..a32a8d2865a 100644 --- a/mysql-test/suite/multi_source/master_info_file.result +++ b/mysql-test/suite/multi_source/master_info_file.result @@ -1,5 +1,5 @@ -CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=SERVER_MYPORT_1; -CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=SERVER_MYPORT_2; +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, master_ssl_verify_server_cert=0; --list_files @@datadir *.info relay-log-named.info relay-log.info diff --git a/mysql-test/suite/multi_source/master_info_file.test b/mysql-test/suite/multi_source/master_info_file.test index 812b22b5706..ec7376ff465 100644 --- a/mysql-test/suite/multi_source/master_info_file.test +++ b/mysql-test/suite/multi_source/master_info_file.test @@ -4,10 +4,8 @@ # This test sees that `--master-info-file` moves/renames this file. --source include/not_embedded.inc ---replace_result $SERVER_MYPORT_1 SERVER_MYPORT_1 ---eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1 ---replace_result $SERVER_MYPORT_2 SERVER_MYPORT_2 ---eval CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=$SERVER_MYPORT_2 +--evalp CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1, master_ssl_verify_server_cert=0 +--evalp CHANGE MASTER 'named' TO master_host='localhost', master_user='test', master_port=$SERVER_MYPORT_2, master_ssl_verify_server_cert=0 --let $datadir = `SELECT @@datadir` --echo --list_files @@datadir *.info