bk commit into 5.1 tree (msvensson:1.2655)

[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@stripped, 2007-12-13 11:39:00+01:00, msvensson@stripped +1 -0
  Only skip restart(and use dynamic binlog switch) if the next test has
'binlog_format_switch' set

  mysql-test/mysql-test-run.pl@stripped, 2007-12-13 11:38:59+01:00, msvensson@stripped
+3 -4
    Only skip restart(and use dynamic binlog switch) if the next test has
'binlog_format_switch' set

diff -Nrup a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
--- a/mysql-test/mysql-test-run.pl	2007-12-13 11:28:32 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-12-13 11:38:59 +01:00
@@ -2818,16 +2818,15 @@ sub server_need_restart {
       ! mtr_same_opts($started_opts, $extra_opt) )
   {
     # Check if diff is binlog format only
+    # and the next test has $binlog_format_switch set
     my @diff_opts= mtr_diff_opts($started_opts, $extra_opt);
     if (@diff_opts == 2 and
 	$diff_opts[0] =~/^--binlog-format=/ and
-	 $diff_opts[1] =~/^--binlog-format=/)
+	$diff_opts[1] =~/^--binlog-format=/ and
+	defined $tinfo->{binlog_format_switch})
     {
       mtr_verbose("Using dynamic switch of binlog format from ",
 		  $diff_opts[0],"to", $diff_opts[1]);
-
-      die "Binlog format to switch to is not set"
-	unless defined $tinfo->{binlog_format_switch};
     }
     else
     {