From db40bd4cc1ec3fa65faf1da14f2e280cf17d5a47 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Mon, 14 Jun 2010 18:57:30 +0200
Subject: [PATCH] mtr: when applying @opt_extra_mysqld_opt for --help, filter
 out --binlog-format - it makes mysqld to fail without --log-bin, and we don't
 need either anyway for --help to work.

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

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 6ec85d19acd..f4fb2bb7d8a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1566,7 +1566,9 @@ sub collect_mysqld_features {
   mtr_add_arg($args, "--basedir=%s", $basedir);
   mtr_add_arg($args, "--language=%s", $path_language);
   mtr_add_arg($args, "--skip-grant-tables");
-  mtr_add_arg($args, $_) for (@opt_extra_mysqld_opt);
+  for (@opt_extra_mysqld_opt) {
+    mtr_add_arg($args, $_) unless /^--binlog-format\b/;
+  }
   my $euid= $>;
   if (!IS_WINDOWS and $euid == 0) {
     mtr_add_arg($args, "--user=root");