diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index dc2c4c1a6fa16d36cfd2b46a283fc72dbd80e766..3e25d6e933cb0a423d446cdad8c2d78ccf9a920a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -732,20 +732,17 @@ sub command_line_setup () { $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