diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 32c82ebe0a51e595a9ae0625fe99aa255a13272b..ba792c38f42871d423db124e33759fde0aa455c7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3600,13 +3600,14 @@ sub mysqld_arguments ($$$$$) { } } - my $pidfile; + # Check if "extra_opt" contains --skip-log-bin + my $skip_binlog= grep('--skip-log-bin', @$extra_opt); if ( $type eq 'master' ) { my $id= $idx > 0 ? $idx + 101 : 1; - if (! $opt_skip_master_binlog) + if (! ($opt_skip_master_binlog || $skip_binlog) ) { mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix, $opt_vardir, $sidx); @@ -3665,7 +3666,7 @@ sub mysqld_arguments ($$$$$) { mtr_add_arg($args, "%s--datadir=%s", $prefix, $slave->[$idx]->{'path_myddir'}); mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix); - if (! $opt_skip_slave_binlog) + if (! ( $opt_skip_slave_binlog || $skip_binlog )) { mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix, $opt_vardir, $sidx); # FIXME use own dir for binlogs @@ -3802,6 +3803,10 @@ sub mysqld_arguments ($$$$$) { { $found_skip_core= 1; } + elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format")) + { + ; # Dont add --binlog-format when running without binlog + } else { mtr_add_arg($args, "%s%s", $prefix, $arg); diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 3213bd4eb5b7da37a85cf9ad60feec5fadd27409..99ba55a7e2bd12f4b702da4856c48e048c9ab669 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -13,5 +13,4 @@ im_daemon_life_cycle : Bug#24415 see note: [19 Dec 23:17] Trudy Pelzer ndb_load : Bug#17233 user_limits : Bug#23921 random failure of user_limits.test -flush2 : Bug#24805 Pushbuild can't handle test with --disable-log-bin diff --git a/mysql-test/t/flush2-master.opt b/mysql-test/t/flush2-master.opt index ccbd01c91d377991bf476a13367a599d3c3a5b1d..789275fa25e27a6eb9994e2f7dc800cd648f00a2 100644 --- a/mysql-test/t/flush2-master.opt +++ b/mysql-test/t/flush2-master.opt @@ -1 +1 @@ ---disable-log-bin +--skip-log-bin