maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2865
committer: Sergei Golubchik <sergii@xxxxxxxxx>
branch nick: 5.1
timestamp: Mon 2010-06-14 18:57:30 +0200
message:
  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.
modified:
  mysql-test/mysql-test-run.pl


--
lp:~maria-captains/maria/5.1-converting
https://code.launchpad.net/~maria-captains/maria/5.1-converting

Your team Maria developers is subscribed to branch lp:~maria-captains/maria/5.1-converting.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1-converting/+edit-subscription

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2010-06-10 09:11:52 +0000
+++ mysql-test/mysql-test-run.pl	2010-06-14 16:57:30 +0000
@@ -1566,7 +1566,9 @@
   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");