From: Date: November 17 2006 1:20pm
Subject: bk commit into 4.1 tree (msvensson:1.2554) BUG#24354
List-Archive: http://lists.mysql.com/commits/15485
X-Bug: 24354
Message-Id: <20061117122052.EA0EE86DEF0@neptunus.localdomain>

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-17 13:20:48+01:00, msvensson@neptunus.(none) +1 -0
  BUG#24354 option "--extern" of mysql-test-run.pl does not work anymore

  mysql-test/mysql-test-run.pl@stripped, 2006-11-17 13:20:46+01:00, msvensson@neptunus.(none) +10 -3
    Don't require restart if master is not started when running with --extern

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.143/mysql-test/mysql-test-run.pl	2006-11-17 13:20:52 +01:00
+++ 1.144/mysql-test/mysql-test-run.pl	2006-11-17 13:20:52 +01:00
@@ -3820,10 +3820,17 @@ sub run_testcase_need_master_restart($)
   }
   elsif( ! $master->[0]->{'pid'} )
   {
-    $do_restart= 1;
-    mtr_verbose("Restart master: master is not started");
+    if ( $opt_extern )
+    {
+      $do_restart= 0;
+      mtr_verbose("No restart: using extern master");
+    }
+    else
+    {
+      $do_restart= 1;
+      mtr_verbose("Restart master: master is not started");
+    }
   }
-
   return $do_restart;
 }