Update the binlog format parse routine to only be avaliable in 5.1 and allow for any binlog_format to be specified

This commit is contained in:
msvensson@neptunus.(none) 2006-10-25 14:56:36 +02:00
parent a6d87b4c00
commit de932f2a5f

View file

@ -732,20 +732,17 @@ sub command_line_setup () {
$used_binlog_format= "stmt"; $used_binlog_format= "stmt";
if ( $mysql_version_id >= 50100 ) 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 ) foreach my $arg ( @opt_extra_mysqld_opt )
{
if ( defined mtr_match_substring($arg,"binlog-format=row"))
{ {
$used_binlog_format= "row"; if ( $arg =~ /binlog-format=(\S+)/ )
} {
elsif ( defined mtr_match_substring($arg,"binlog-format=stmt")) $used_binlog_format= $1;
{ }
$used_binlog_format= "stmt";
} }
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 # Check if we should speed up tests by trying to run on tmpfs