bk commit into 5.1 tree (msvensson:1.2654)

[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:28:34+01:00, msvensson@stripped +1 -0
  Don't add --binlog-format if --skip-log-bin or --loose-skip-log-bin is
  used for the test

  mysql-test/mysql-test-run.pl@stripped, 2007-12-13 11:28:32+01:00, msvensson@stripped +2 -2
    Don't add --binlog-format if --skip-log-bin or --loose-skip-log-bin is
    used for the test

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-12 18:18:44 +01:00
+++ b/mysql-test/mysql-test-run.pl	2007-12-13 11:28:32 +01:00
@@ -2600,8 +2600,8 @@ sub mysqld_arguments ($$$) {
     mtr_add_arg($args, "%s--log-output=table,file", $prefix);
   }
 
-  # Check if "extra_opt" contains --skip-log-bin
-  my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
+  # Check if "extra_opt" contains skip-log-bin
+  my $skip_binlog= grep(/^(--|--loose-)skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt);
 
   if ( $opt_debug )
   {