Commit e402af83 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Auto merged
parents 5b29efaf 7596e12b

mysql-test/mysql-test-run.pl

+8 −11
Original line number Diff line number Diff line
@@ -732,20 +732,17 @@ sub command_line_setup () { 
  $used_binlog_format= "stmt";

  if ( $mysql_version_id >= 50100 )

  {

    $used_binlog_format= "mixed";

  }

    $used_binlog_format= "mixed"; # Default value for binlog format



    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"))

      if ( $arg =~ /binlog-format=(\S+)/ )

      {

      $used_binlog_format= "stmt";

	$used_binlog_format= $1;

      }

    }

    mtr_report("Using binlog format '$used_binlog_format'");

  }



  # --------------------------------------------------------------------------

  # Check if we should speed up tests by trying to run on tmpfs