From 75e11ec52c0f0f66293f7fe3a490774c6ea8eae9 Mon Sep 17 00:00:00 2001 From: ParadoxV5 Date: Sun, 6 Apr 2025 15:55:12 -0600 Subject: [PATCH] MDEV-36238 11.4 follow-up: `Master_SSL_Verify_Server_Cert=0` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Tweak `multi_source.master_info_file` re. MDEV-31857’s new default `Master_SSL_Verify_Server_Cert=0` was optional before that secure-by-default change. Now, passwordless connections must disable SSL certificate verification. Because the default unnamed connection cannot be deleted by RESET REPLICA ALL, it must be explicitly left passwordless and having `Master_SSL_Verify_Server_Cert=0`. The named connection is cleaned up by RESET REPLICA ALL and thus not affected. --- mysql-test/suite/multi_source/master_info_file.result | 2 +- mysql-test/suite/multi_source/master_info_file.test | 2 +- 2 files changed, 2 insertions(+), 2 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..9a0623369d7 100644 --- a/mysql-test/suite/multi_source/master_info_file.result +++ b/mysql-test/suite/multi_source/master_info_file.result @@ -1,4 +1,4 @@ -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; --list_files @@datadir *.info relay-log-named.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..48478fa6e35 100644 --- a/mysql-test/suite/multi_source/master_info_file.test +++ b/mysql-test/suite/multi_source/master_info_file.test @@ -5,7 +5,7 @@ --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 +--eval CHANGE MASTER TO master_host='127.0.0.1', master_user='root', master_port=$SERVER_MYPORT_1, 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