From 4e9c252bc4bfef525ff8ec4a37fabd957694285d Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 30 Jul 2025 18:54:34 +0200 Subject: [PATCH] multi_source.mariadb-dump_slave: don't change global settings --- check-mysqld_1.result +++ check-mysqld_1.reject @@ -31,7 +31,7 @@ Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master NULL -Master_SSL_Verify_Server_Cert No +Master_SSL_Verify_Server_Cert Yes Last_IO_Errno 0 Last_IO_Error Last_SQL_Errno 0 --- mysql-test/suite/multi_source/mariadb-dump_slave.result | 6 +++--- mysql-test/suite/multi_source/mariadb-dump_slave.test | 9 ++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/multi_source/mariadb-dump_slave.result b/mysql-test/suite/multi_source/mariadb-dump_slave.result index 41fa0536bba..6a51065efa9 100644 --- a/mysql-test/suite/multi_source/mariadb-dump_slave.result +++ b/mysql-test/suite/multi_source/mariadb-dump_slave.result @@ -1,11 +1,11 @@ connect active_master, 127.0.0.1, root, , , $SERVER_MYPORT_2; connect inactive_master, 127.0.0.1, root, , , $SERVER_MYPORT_3; connect slave, 127.0.0.1, root, , , $SERVER_MYPORT_1; -CHANGE MASTER TO -master_host='127.0.0.1', master_port=MYPORT_2, master_user='root'; +CHANGE MASTER TO master_ssl_verify_server_cert=0, +master_host='127.0.0.1', master_port=$SERVER_MYPORT_2, master_user='root'; START SLAVE SQL_THREAD; CHANGE MASTER 'inactive' TO -master_host='127.0.0.1', master_port=MYPORT_3; +master_host='127.0.0.1', master_port=$SERVER_MYPORT_3; include/wait_for_slave_sql_to_start.inc # Control State Connection_name = '' diff --git a/mysql-test/suite/multi_source/mariadb-dump_slave.test b/mysql-test/suite/multi_source/mariadb-dump_slave.test index 35cdb6887ec..2979dc0029d 100644 --- a/mysql-test/suite/multi_source/mariadb-dump_slave.test +++ b/mysql-test/suite/multi_source/mariadb-dump_slave.test @@ -10,17 +10,14 @@ --connect (inactive_master, 127.0.0.1, root, , , $SERVER_MYPORT_3) --connect ( slave, 127.0.0.1, root, , , $SERVER_MYPORT_1) ---replace_result $SERVER_MYPORT_2 MYPORT_2 -eval CHANGE MASTER TO +evalp CHANGE MASTER TO master_ssl_verify_server_cert=0, master_host='127.0.0.1', master_port=$SERVER_MYPORT_2, master_user='root'; START SLAVE SQL_THREAD; ---replace_result $SERVER_MYPORT_3 MYPORT_3 -eval CHANGE MASTER 'inactive' TO +evalp CHANGE MASTER 'inactive' TO master_host='127.0.0.1', master_port=$SERVER_MYPORT_3; # wait for the active default '' connection only --source include/wait_for_slave_sql_to_start.inc - --echo # Control State --source include/show_slave_status.inc @@ -29,7 +26,6 @@ eval CHANGE MASTER 'inactive' TO --replace_result $SERVER_MYPORT_2 MYPORT_2 $SERVER_MYPORT_3 MYPORT_3 --exec $MYSQL_DUMP --compact --dump-slave --include-master-host-port test - # The 'inactive' connection should remain stopped # while the active '' connection should restart. @@ -46,7 +42,6 @@ eval CHANGE MASTER 'inactive' TO --source include/wait_for_slave_sql_to_start.inc --source include/show_slave_status.inc - --echo # Cleanup STOP SLAVE SQL_THREAD; --disconnect active_master