From 9d5b871f166538bd8bf57fbb7aad60a101526abf Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Fri, 6 Oct 2006 12:46:21 +0200
Subject: [PATCH 1/2] Always need restart for im_* tests

---
 mysql-test/mysql-test-run.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 31a2c1e32a3..2226c62a262 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3490,6 +3490,11 @@ sub run_testcase_need_master_restart($)
     $do_restart= 1;           # Restart with cluster
     mtr_verbose("Restart because: Test need cluster");
   }
+  elsif( $tinfo->{'component_id'} eq 'im' )
+  {
+    $do_restart= 1;
+    mtr_verbose("Restart because: Always restart for im tests");
+  }
   elsif ( $master->[0]->{'running_master_is_special'} and
 	  $master->[0]->{'running_master_is_special'}->{'timezone'} eq
 	  $tinfo->{'timezone'} and

From d3bc5df83716c115d27e4aa09b8f6410f84a7fce Mon Sep 17 00:00:00 2001
From: "msvensson@neptunus.(none)" <>
Date: Fri, 6 Oct 2006 13:33:12 +0200
Subject: [PATCH 2/2] Modify regex for parsing mysqld version as the mysqld is
 sometimes a libtool wrapper and the "mysqld --version" command will print
 "/path/.libs/lt-mysqld  Ver x.x.x"

---
 mysql-test/mysql-test-run.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 2226c62a262..4eef16e0388 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1177,7 +1177,9 @@ sub check_mysqld_features () {
     if ( !$mysql_version_id )
     {
       # Look for version
-      if ( $line =~ /^$exe_mysqld\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )
+      my $exe_name= basename($exe_mysqld);
+      mtr_verbose("exe_name: $exe_name");
+      if ( $line =~ /^\S*$exe_name\s\sVer\s([0-9]*)\.([0-9]*)\.([0-9]*)/ )
       {
 	#print "Major: $1 Minor: $2 Build: $3\n";
 	$mysql_version_id= $1*10000 + $2*100 + $3;