From c9e76d514ab9aafc1984545217ae52ba639a0f2b Mon Sep 17 00:00:00 2001
From: "anozdrin/alik@alik." <>
Date: Fri, 8 Sep 2006 16:41:35 +0400
Subject: [PATCH] Fix for BUG#22074: mysql-test-run.pl abort test run if it
 fails to start instance manager.

The problem was that if IM failed to start, test suite aborts.

The fix is to mark current test as failed, and continue running
test suite.

The fix affects only test suite.
---
 mysql-test/mysql-test-run.pl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 1217ae9305a..819406bcc41 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -2114,7 +2114,10 @@ sub run_testcase ($) {
 
       unless ( mtr_im_start($instance_manager, $tinfo->{im_opts}) )
       {
-        mtr_error("Failed to start Instance Manager.")
+        report_failure_and_restart($tinfo);
+        mtr_report("Failed to start Instance Manager. " .
+                   "The test '$tname' is marked as failed.");
+        return;
       }
     }