diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ae3d7f6a851..d5a10680aea 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3008,7 +3008,7 @@ language = $path_language character-sets-dir = $path_charsetsdir basedir = $path_my_basedir server_id = $server_id -shutdown-delay = 10 +shutdown_delay = 10 skip-stack-trace skip-innodb skip-ndbcluster diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result index a2baeac5f14..b3afb15f207 100644 --- a/mysql-test/r/im_daemon_life_cycle.result +++ b/mysql-test/r/im_daemon_life_cycle.result @@ -21,6 +21,6 @@ Success: the process was restarted. Success: server is ready to accept connection on socket. SHOW INSTANCE STATUS mysqld1; instance_name state version_number version mysqld_compatible -mysqld1 online VERSION_NUMBER VERSION no +mysqld1 STATE VERSION_NUMBER VERSION no STOP INSTANCE mysqld2; Success: the process has been stopped.