diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-10-24 23:39:46 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-10-24 23:39:46 +0200 |
| commit | 4da54b476959b9b12bb9fa11a272f1b0400cbf32 (patch) | |
| tree | 30f632fd7d017029133dd4575c143d6bdea68a82 | |
| parent | f89efeb5f60c8cdbf1a4f70003f7740623934220 (diff) | |
| download | mariadb-git-4da54b476959b9b12bb9fa11a272f1b0400cbf32.tar.gz | |
Adapt mysql-test-run.pl to mysqld in 5.1 using "mixed" binlog format by default
| -rw-r--r-- | mysql-test/lib/mtr_cases.pl | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl index 7a01c66305b..17019cfd351 100644 --- a/mysql-test/lib/mtr_cases.pl +++ b/mysql-test/lib/mtr_cases.pl @@ -565,6 +565,7 @@ our @tags= ["include/have_innodb.inc", "innodb_test", 1], ["include/have_binlog_format_row.inc", "binlog_format", "row"], ["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/have_debug.inc", "need_debug", 1], ["include/have_ndb.inc", "ndb_test", 1], diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 72b4fe95132..9fc63e0462b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -714,12 +714,20 @@ sub command_line_setup () { # -------------------------------------------------------------------------- # NOTE if the default binlog format is changed, this has to be changed $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= "stmt"; + } } mtr_report("Using binlog format '$used_binlog_format'"); |