Fix merge & update result file.

50e5958f · anozdrin/alik@alik.opbmk · fe585401 · 50e5958f · 50e5958f
Commit 50e5958f authored Feb 23, 2007 by anozdrin/alik@alik.opbmk
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

mysql-test/mysql-test-run.pl mysql-test/mysql-test-run.pl +1 -1

mysql-test/r/im_utils.result mysql-test/r/im_utils.result +2 -0

No files found.
--- 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

--- a/mysql-test/r/im_utils.result
+++ b/mysql-test/r/im_utils.result
@@ -19,6 +19,7 @@ language	VALUE
 character-sets-dir	VALUE
 basedir	VALUE
 server_id	VALUE
+shutdown-delay	VALUE
 skip-stack-trace	VALUE
 skip-innodb	VALUE
 skip-ndbcluster	VALUE
@@ -37,6 +38,7 @@ language	VALUE
 character-sets-dir	VALUE
 basedir	VALUE
 server_id	VALUE
+shutdown-delay	VALUE
 skip-stack-trace	VALUE
 skip-innodb	VALUE
 skip-ndbcluster	VALUE