Commit adeaeb50 authored by unknown's avatar unknown

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
parent edccb4c2
--source include/have_log_bin.inc
--source include/not_embedded.inc --source include/not_embedded.inc
--source ./include/have_federated_db.inc --source ./include/have_federated_db.inc
......
...@@ -3740,8 +3740,7 @@ sub mysqld_arguments ($$$$) { ...@@ -3740,8 +3740,7 @@ sub mysqld_arguments ($$$$) {
"%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path); "%s--log-slow-queries=%s-slow.log", $prefix, $log_base_path);
# Check if "extra_opt" contains --skip-log-bin # 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 ( $mysqld->{'type'} eq 'master' )
{ {
if (! ($opt_skip_master_binlog || $skip_binlog) ) if (! ($opt_skip_master_binlog || $skip_binlog) )
......
Variable_name Value Variable_name Value
have_log_bin ON log_bin ON
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment