bk commit into 5.1 tree (msvensson:1.2164)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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
  1.2164 06/05/18 19:52:43 msvensson@shellback.(none) +2 -0
  Save "master_opt" in master so it can be checked later to see if it's the same as the
test that are about to run uses the same.

  mysql-test/mysql-test-run.pl
    1.115 06/05/18 19:52:33 msvensson@shellback.(none) +11 -0
    Save "master_opt" in master so it can be checked later to see if it's the same as the
test that are about to run uses the same.

  mysql-test/lib/mtr_cases.pl
    1.21 06/05/18 19:52:33 msvensson@shellback.(none) +6 -7
    Move setting of --skip-innodb out of recursive loop

# 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:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint

--- 1.20/mysql-test/lib/mtr_cases.pl	2006-05-17 23:54:41 +02:00
+++ 1.21/mysql-test/lib/mtr_cases.pl	2006-05-18 19:52:33 +02:00
@@ -458,6 +458,12 @@
   else
   {
     mtr_options_from_test_file($tinfo,"$testdir/${tname}.test");
+
+    if ( ! $tinfo->{'innodb_test'} )
+    {
+      # mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");
+      push(@{$tinfo->{'master_opt'}}, "--skip-innodb");
+    }
   }
 
   # We can't restart a running server that may be in use
@@ -499,13 +505,6 @@
 
   }
   close FILE;
-
-  if ( ! $tinfo->{'innodb_test'} )
-  {
-    # mtr_report("Adding '--skip-innodb' to $tinfo->{'name'}");
-    push(@{$tinfo->{'master_opt'}}, "--skip-innodb");
-  }
-
 
 }
 

--- 1.114/mysql-test/mysql-test-run.pl	2006-05-12 12:31:59 +02:00
+++ 1.115/mysql-test/mysql-test-run.pl	2006-05-18 19:52:33 +02:00
@@ -876,6 +876,7 @@
    start_timeout =>  400, # enough time create innodb tables
 
    ndbcluster    =>  1, # ndbcluster not started
+   master_opt    => [],
   };
 
   $master->[1]=
@@ -2140,6 +2141,14 @@
     {
       $do_restart= 1;
     }
+    # Check that running master was started with same options
+    # as the current test requires
+    elsif (! mtr_same_opts($master->[0]->{'master_opt'},
+			   $tinfo->{'master_opt'}) )
+    {
+      $do_restart= 1;
+    }
+
 
     if ( $do_restart )
     {
@@ -2219,6 +2228,8 @@
           report_failure_and_restart($tinfo);
           return;
         }
+	# Remember options used to start
+	$master->[0]->{'master_opt'}= $tinfo->{'master_opt'};
       }
       if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
       {