diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-05-15 11:32:33 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-05-15 11:32:33 +0200 |
| commit | adeaeb5025f9bb7e462973f0a8c0f1f43af9a3e9 (patch) | |
| tree | 0ea40bdc5e97812b1fe4f870a963bf7561862070 | |
| parent | edccb4c29ed83abe139f6faf215591bd7fe3a104 (diff) | |
| download | mariadb-git-adeaeb5025f9bb7e462973f0a8c0f1f43af9a3e9.tar.gz | |
BUG#28370 federated test cases fail with binlog disabled
mysql-test/include/federated.inc:
BUG#28370 all federated tests require --log-bin for now
mysql-test/mysql-test-run.pl:
BUG#28370 detect --skip-log-bin option in mtr's --mysqld option
mysql-test/r/have_log_bin.require:
the variable is really called log_bin
| -rw-r--r-- | mysql-test/include/federated.inc | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 | ||||
| -rw-r--r-- | mysql-test/r/have_log_bin.require | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/include/federated.inc b/mysql-test/include/federated.inc index c8e8ededa11..7bdb2efaa8b 100644 --- a/mysql-test/include/federated.inc +++ b/mysql-test/include/federated.inc @@ -1,3 +1,4 @@ +--source include/have_log_bin.inc --source include/not_embedded.inc --source ./include/have_federated_db.inc diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c494626bbae..6bf35410783 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3740,8 +3740,7 @@ sub mysqld_arguments ($$$$) { "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path); # Check if "extra_opt" contains --skip-log-bin - my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt); - + my $skip_binlog= grep(/^--skip-log-bin/, @$extra_opt, @opt_extra_mysqld_opt); if ( $mysqld->{'type'} eq 'master' ) { if (! ($opt_skip_master_binlog || $skip_binlog) ) diff --git a/mysql-test/r/have_log_bin.require b/mysql-test/r/have_log_bin.require index cacdf8df0ce..d4fd77e4f8d 100644 --- a/mysql-test/r/have_log_bin.require +++ b/mysql-test/r/have_log_bin.require @@ -1,2 +1,2 @@ Variable_name Value -have_log_bin ON +log_bin ON |