Skip to content

Commit 51b7372

Browse files
george-reynyainikep
authored andcommitted
[only_mtr] Add --no-defaults to MYSQLADMIN calls
Summary: `MYSQLADMIN` without `--no-defaults` option picks up default SSL settings that don't work for the test instances and fail with the following error: ``` mysqladmin: connect to server at 'localhost' failed error: 'SSL connection error: error:1000007d:SSL routines:OPENSSL_internal:CERTIFICATE_VERIFY_FAILED (errno 71)' ``` Add this option to the few places that are missing it. The rest of the 94 usages are all using `--no-defaults` or specify the default settings file. Differential Revision: D46236557
1 parent 670bfc9 commit 51b7372

File tree

6 files changed

+6
-7
lines changed

6 files changed

+6
-7
lines changed

mysql-test/include/restart_with_mysqld_safe_cleanup.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
--let $_server_id= `SELECT @@server_id`
1515

1616
# Shutdown mysqld with mysqladmin
17-
--exec $MYSQLADMIN -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
17+
--exec $MYSQLADMIN --no-defaults -h localhost -S $MYSQL_SOCKET -P $MYSQL_PORT -u root shutdown 2>&1
1818

1919
# Delay introduced - mysqld_safe takes some time to restart mysqld
2020
--source include/wait_until_disconnected.inc

mysql-test/suite/group_replication/t/gr_clone_integration_concurrent_shutdown.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ SET DEBUG_SYNC = 'now WAIT_FOR gr_clone_paused';
8888
--let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect
8989
--exec echo "wait" > $_expect_file_name
9090

91-
--exec $MYSQLADMIN -uroot --password="" -S $SLAVE_MYSOCK shutdown 2>&1
91+
--exec $MYSQLADMIN --no-defaults -uroot --password="" -S $SLAVE_MYSOCK shutdown 2>&1
9292

9393
--source include/wait_until_disconnected.inc
9494

mysql-test/suite/group_replication/t/gr_uninstall_while_network_blocked.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ UNINSTALL PLUGIN group_replication;
8989
--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
9090
--disable_result_log
9191
--replace_regex /.*mysqladmin.*: /mysqladmin: /
92-
--exec $MYSQLADMIN -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT shutdown 2>&1
92+
--exec $MYSQLADMIN --no-defaults -uroot -S $MASTER_MYSOCK -P $MASTER_MYPORT shutdown 2>&1
9393
--enable_result_log
9494

9595
--source include/wait_until_disconnected.inc

mysql-test/suite/group_replication/t/gr_variables_mysqladmin.test

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SET @@GLOBAL.group_replication_ip_allowlist= "AUTOMATIC";
1717

1818
#=============== Checking the group replication variable values ================
1919
--echo =====mysqladmin -u root -P MASTER_MYPORT --protocol=TCP check all the GR variable outputs=====
20-
--exec $MYSQLADMIN -u root -P $MASTER_MYPORT --protocol=TCP variables >$MYSQLTEST_VARDIR/tmp/group_replication_variables_mysqladmin.tmp
20+
--exec $MYSQLADMIN --no-defaults -u root -P $MASTER_MYPORT --protocol=TCP variables >$MYSQLTEST_VARDIR/tmp/group_replication_variables_mysqladmin.tmp
2121

2222
# This subroutine checks for group replication variables in the dump file and
2323
# adds it to @varlist and then prints the item from the list
@@ -70,4 +70,3 @@ EOF
7070
--remove_file "$MYSQLTEST_VARDIR/tmp/group_replication_variables_mysqladmin.tmp";
7171
--echo
7272
--source include/group_replication_end.inc
73-

mysql-test/t/compression.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ DROP TABLE wl12475.t1;
459459
SELECT COUNT(*) FROM wl12475.t1;
460460

461461
# check mysqladmin client
462-
--exec $MYSQLADMIN -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --compression-algorithms="zstd" --zstd-compression-level=7 --skip-verbose ping 2>&1
462+
--exec $MYSQLADMIN --no-defaults -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --compression-algorithms="zstd" --zstd-compression-level=7 --skip-verbose ping 2>&1
463463

464464
# check mysqlcheck client
465465
--exec $MYSQL_CHECK --repair --compression-algorithms="zstd" --zstd-compression-level=7 --databases wl12475 > /dev/null 2>&1

mysql-test/t/compression_stream.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ DROP TABLE wl12475.t1;
459459
SELECT COUNT(*) FROM wl12475.t1;
460460

461461
# check mysqladmin client
462-
--exec $MYSQLADMIN -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --compression-algorithms="zstd_stream" --zstd-compression-level=7 --skip-verbose ping 2>&1
462+
--exec $MYSQLADMIN --no-defaults -uroot -h localhost --password="" -S $MASTER_MYSOCK -P $MASTER_MYPORT --compression-algorithms="zstd_stream" --zstd-compression-level=7 --skip-verbose ping 2>&1
463463

464464
# check mysqlcheck client
465465
--exec $MYSQL_CHECK --repair --compression-algorithms="zstd_stream" --zstd-compression-level=7 --databases wl12475 > /dev/null 2>&1

0 commit comments

Comments
 (0)