From 4acc8e9d2b09523636c503c952acba5f4c0f897c Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 23 Feb 2007 23:36:25 +0300 Subject: [PATCH] Fix merge & update result file. mysql-test/mysql-test-run.pl: Fix merge. mysql-test/r/im_utils.result: Updated result file. --- mysql-test/mysql-test-run.pl | 2 +- mysql-test/r/im_utils.result | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d5a10680aea..ae3d7f6a851 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_utils.result b/mysql-test/r/im_utils.result index b7c68965ada..397050635e1 100644 --- 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