WL#3949, Added the optimization of rpl tests if mtr started w/o a combination and --mysqld=--binlog-format=XXX

mysql-test/lib/mtr_cases.pl:
  Added the optimization of rpl tests

1 files changed, 11 insertions, 0 deletions

diff --git a/mysql-test/lib/mtr_cases.pl b/mysql-test/lib/mtr_cases.pl
index 46a0ed7e192..d033697ee25 100644
--- a/mysql-test/lib/mtr_cases.pl
+++ b/mysql-test/lib/mtr_cases.pl
@@ -479,6 +479,17 @@ sub optimize_cases {
 	}
       }
 
+      # =======================================================
+      # Use dynamic switching of binlog-format if mtr started
+      # w/o --mysqld=--binlog-format=xxx and combinations.
+      # =======================================================
+      if (!defined $tinfo->{'combination'} and 
+          $tinfo->{'skip'} ne 1 and 
+          !defined $::used_binlog_format) 
+      {
+        $test_binlog_format= $tinfo->{'sup_binlog_formats'}->[0];
+      }
+
       # Save binlog format for dynamic switching
       $tinfo->{binlog_format}= $test_binlog_format;
     }