bk commit into 5.1 tree (msvensson:1.2326)

[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, 2006-10-25 14:59:54+02:00, msvensson@neptunus.(none) +1 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2078.93

  mysql-test/mysql-test-run.pl@stripped, 2006-10-25 14:59:35+02:00, msvensson@neptunus.(none)
+5 -16
    Use remote version of mysql-test-run.pl
    MERGE: 1.30.1.115

# 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-5.1-new-maint/RESYNC

--- 1.212/mysql-test/mysql-test-run.pl	2006-10-25 15:00:05 +02:00
+++ 1.213/mysql-test/mysql-test-run.pl	2006-10-25 15:00:05 +02:00
@@ -732,20 +732,17 @@
   $used_binlog_format= "stmt";
   if ( $mysql_version_id >= 50100 )
   {
-    $used_binlog_format= "mixed";
-  }
-  foreach my $arg ( @opt_extra_mysqld_opt )
-  {
-    if ( defined mtr_match_substring($arg,"binlog-format=row"))
-    {
-      $used_binlog_format= "row";
-    }
-    elsif ( defined mtr_match_substring($arg,"binlog-format=stmt"))
+    $used_binlog_format= "mixed"; # Default value for binlog format
+
+    foreach my $arg ( @opt_extra_mysqld_opt )
     {
-      $used_binlog_format= "stmt";
+      if ( $arg =~ /binlog-format=(\S+)/ )
+      {
+	$used_binlog_format= $1;
+      }
     }
+    mtr_report("Using binlog format '$used_binlog_format'");
   }
-  mtr_report("Using binlog format '$used_binlog_format'");
 
   # --------------------------------------------------------------------------
   # Check if we should speed up tests by trying to run on tmpfs