diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 08:33:50 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-07 08:33:50 +0300 |
| commit | 4b6f5aec55305c6424749e919c65165d3b8d9bb1 (patch) | |
| tree | 1cc0bc38c0d635b7006b884b5125ee45a17342a1 | |
| parent | 814c69ea306ca315b9fd8cef50ec5fbcd67e36e9 (diff) | |
| download | mariadb-git-4b6f5aec55305c6424749e919c65165d3b8d9bb1.tar.gz | |
main.mysqladmin: Prefer restarting to killing
We do not want subsequent test executions to fail due to messages
about mysql.help_% tables needing recovery.
Thanks to Sergei Golubchik for noticing this.
| -rw-r--r-- | mysql-test/main/mysqladmin.result | 2 | ||||
| -rw-r--r-- | mysql-test/main/mysqladmin.test | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/mysql-test/main/mysqladmin.result b/mysql-test/main/mysqladmin.result index 99615f60e1b..5a45a5f366a 100644 --- a/mysql-test/main/mysqladmin.result +++ b/mysql-test/main/mysqladmin.result @@ -17,7 +17,6 @@ mysqld is alive # Creating an empty file 'cnf_file' # Using --defaults-extra-file option with 'cnf_file'. mysqld is alive -# Kill the server # restart: --ssl-key=MYSQLTEST_VARDIR/tmp/ssl_key.pem --ssl-cert=MYSQLTEST_VARDIR/tmp/ssl_cert.pem connect ssl_con,localhost,root,,,,,SSL; SELECT VARIABLE_VALUE INTO @ssl_not_after FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_server_not_after'; @@ -26,5 +25,4 @@ SELECT VARIABLE_VALUE INTO @ssl_not_after FROM INFORMATION_SCHEMA.SESSION_STATUS Result OK # Cleanup -# Kill the server # restart diff --git a/mysql-test/main/mysqladmin.test b/mysql-test/main/mysqladmin.test index 97e805ecf73..9ba5203963a 100644 --- a/mysql-test/main/mysqladmin.test +++ b/mysql-test/main/mysqladmin.test @@ -56,7 +56,7 @@ EOF # MDEV-19168 Reload SSL certificate # This test reloads server SSL certs ./mysqladmin flush-ssl, and checks that new SSL # connection use new certificate. -# SWtatus variable Ssl_server_not_after is used to tell the old certificate from new. +# Status variable Ssl_server_not_after is used to tell the old certificate from new. # source include/have_ssl_communication.inc; @@ -72,8 +72,7 @@ copy_file $MYSQL_TEST_DIR/std_data/server-key.pem $ssl_key; copy_file $MYSQL_TEST_DIR/std_data/server-cert.pem $ssl_cert; let $restart_parameters=--ssl-key=$ssl_key --ssl-cert=$ssl_cert; ---source include/kill_mysqld.inc ---source include/start_mysqld.inc +--source include/restart_mysqld.inc connect ssl_con,localhost,root,,,,,SSL; SELECT VARIABLE_VALUE INTO @ssl_not_after FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='Ssl_server_not_after'; @@ -94,7 +93,6 @@ exec $MYSQL --ssl -e "SELECT IF(VARIABLE_VALUE <> '$ssl_not_after', 'OK', 'FAI --echo # Cleanup remove_file $ssl_cert; remove_file $ssl_key; -# restart with usuall SSL +# restart with usual SSL let $restart_parameters=; ---source include/kill_mysqld.inc ---source include/start_mysqld.inc +--source include/restart_mysqld.inc |