Bug#24805 mtr.pl can't handle test with --disable-log-bin

- Don't give mysqld the --log-bin argument if .opt file
  contains --skip-log-bin
- Enable flush2 test


mysql-test/mysql-test-run.pl:
  Don't give mysqld the --log-bin argument if .opt file contains --skip-log-bin 
  Don't pass mysqld --binlog-format=s if --skip-log-bin
mysql-test/t/disabled.def:
  Enable flush2
mysql-test/t/flush2-master.opt:
  Use --skip-log-bin in flush2 to test flush without bin logging

1 files changed, 8 insertions, 3 deletions

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index ffc27ecabdb..b0854a7c54b 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3554,13 +3554,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);
@@ -3619,7 +3620,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
@@ -3756,6 +3757,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);