Merge pilot.(none):/data/msvensson/mysql/bug28369/my51-bug28369

into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint

1 files changed, 17 insertions, 0 deletions

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index d3db3471e1e..a663e98821f 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -596,6 +596,22 @@ sub collect_one_test_case($$$$$$$) {
       }
     }
 
+    if ( $tinfo->{'need_binlog'} )
+    {
+      if (grep(/^--skip-log-bin/,  @::opt_extra_mysqld_opt) )
+      {
+	$tinfo->{'skip'}= 1;
+	$tinfo->{'comment'}= "Test need binlog";
+	return;
+      }
+    }
+    else
+    {
+      # Test does not need binlog, add --skip-binlog to
+      # the options used when starting it
+      push(@{$tinfo->{'master_opt'}}, "--skip-log-bin");
+    }
+
   }
 }
 
@@ -606,6 +622,7 @@ our @tags=
 (
  ["include/have_innodb.inc", "innodb_test", 1],
  ["include/have_binlog_format_row.inc", "binlog_format", "row"],
+ ["include/have_binlog.inc", "need_binlog", 1],
  ["include/have_binlog_format_statement.inc", "binlog_format", "statement"],
  ["include/have_binlog_format_mixed.inc", "binlog_format", "mixed"],
  ["include/big_test.inc", "big_test", 1],