mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
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:
parent
a6d87b4c00
commit
de932f2a5f
1 changed files with 8 additions and 11 deletions
|
@ -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= "mixed"; # Default value for binlog format
|
||||
|
||||
foreach my $arg ( @opt_extra_mysqld_opt )
|
||||
{
|
||||
$used_binlog_format= "row";
|
||||
}
|
||||
elsif ( defined mtr_match_substring($arg,"binlog-format=stmt"))
|
||||
{
|
||||
$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
|
||||
|
|
Loading…
Reference in a new issue