database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default

Browse Source
This commit is contained in:
unknown
2006-10-24 23:39:46 +02:00
parent f89efeb5f6
commit 4da54b4769
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql-test/lib/mtr_cases.pl
View File

@ -565,6 +565,7 @@ our @tags=
["include/have_innodb.inc", "innodb_test", 1], ["include/have_innodb.inc", "innodb_test", 1],
["include/have_binlog_format_row.inc", "binlog_format", "row"], ["include/have_binlog_format_row.inc", "binlog_format", "row"],
["include/have_binlog_format_statement.inc", "binlog_format", "stmt"], ["include/have_binlog_format_statement.inc", "binlog_format", "stmt"],
["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
["include/big_test.inc", "big_test", 1], ["include/big_test.inc", "big_test", 1],
["include/have_debug.inc", "need_debug", 1], ["include/have_debug.inc", "need_debug", 1],
["include/have_ndb.inc", "ndb_test", 1], ["include/have_ndb.inc", "ndb_test", 1],

8
mysql-test/mysql-test-run.pl
View File

@ -714,12 +714,20 @@ sub command_line_setup () {
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# NOTE if the default binlog format is changed, this has to be changed # NOTE if the default binlog format is changed, this has to be changed
$used_binlog_format= "stmt"; $used_binlog_format= "stmt";
if ( $mysql_version_id >= 50100 )
{
$used_binlog_format= "mixed";
}
foreach my $arg ( @opt_extra_mysqld_opt ) foreach my $arg ( @opt_extra_mysqld_opt )
{ {
if ( defined mtr_match_substring($arg,"binlog-format=row")) if ( defined mtr_match_substring($arg,"binlog-format=row"))
{ {
$used_binlog_format= "row"; $used_binlog_format= "row";
} }
elsif ( defined mtr_match_substring($arg,"binlog-format=stmt"))
{
$used_binlog_format= "stmt";
}
} }
mtr_report("Using binlog format '$used_binlog_format'"); mtr_report("Using binlog format '$used_binlog_format'");