From 1cee31a6fd20c8ebc688a034d985a71f26e698e8 Mon Sep 17 00:00:00 2001
From: "kostja@bodhi.local" <>
Date: Thu, 30 Nov 2006 02:42:01 +0300
Subject: [PATCH] A post-merge fix.

---
 mysql-test/lib/mtr_process.pl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mysql-test/lib/mtr_process.pl b/mysql-test/lib/mtr_process.pl
index 9d0c1f601ba..79285de88a7 100644
--- a/mysql-test/lib/mtr_process.pl
+++ b/mysql-test/lib/mtr_process.pl
@@ -937,6 +937,12 @@ sub check_expected_crash_and_restart($)
       }
     }
   }
+
+  if ($::instance_manager->{'spawner_pid'} eq $ret_pid)
+  {
+    return;
+  }
+
   mtr_warning("check_expected_crash_and_restart couldn't find an entry for pid: $ret_pid");
 
 }