From 6a4af260cc5d41cbbca6b4744682da4ee11d03d1 Mon Sep 17 00:00:00 2001
From: Magnus Svensson <msvensson@mysql.com>
Date: Fri, 29 Aug 2008 14:46:22 +0200
Subject: [PATCH] Bug#36616  rpl tests without 'source
 include/have_log_bin.inc' fail starting server

---
 mysql-test/mysql-test-run.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index dbc108d4fb2..59bf70363e8 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3623,6 +3623,11 @@ sub mysqld_arguments ($$$) {
     {
       ; # Dont add --binlog-format when running without binlog
     }
+    elsif ($arg eq "--loose-skip-log-bin" and
+           $mysqld->option("log-slave-updates"))
+    {
+      ; # Dont add --skip-log-bin when mysqld have --log-slave-updates in config
+    }
     else
     {
       mtr_add_arg($args, "%s", $arg);