From a9e8d461e330e7fff84b9b507e4a1508b4aee35b Mon Sep 17 00:00:00 2001 From: "anozdrin/alik@alik.opbmk" <> Date: Fri, 23 Feb 2007 21:13:21 +0300 Subject: [PATCH 1/2] Fix result file. --- mysql-test/r/im_daemon_life_cycle.result | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/r/im_daemon_life_cycle.result b/mysql-test/r/im_daemon_life_cycle.result index d80a34f8427..1a0741e7caf 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 status version -mysqld1 online VERSION +mysqld1 STATE VERSION STOP INSTANCE mysqld2; Success: the process has been stopped. From 90115eac42093be92f0c163581a034b9fe651273 Mon Sep 17 00:00:00 2001 From: "anozdrin/alik@alik.opbmk" <> Date: Fri, 23 Feb 2007 21:51:33 +0300 Subject: [PATCH 2/2] Fix mysql-test-run.pl: IM in 5.0 uses old incorrect 'shutdown_delay' option name. --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index a2460edec73..a64808cfb87 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -2993,7 +2993,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