Commit 20f54204 authored by Sergei Golubchik's avatar Sergei Golubchik

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.
parent e96e2f62
...@@ -1566,7 +1566,9 @@ sub collect_mysqld_features { ...@@ -1566,7 +1566,9 @@ sub collect_mysqld_features {
mtr_add_arg($args, "--basedir=%s", $basedir); mtr_add_arg($args, "--basedir=%s", $basedir);
mtr_add_arg($args, "--language=%s", $path_language); mtr_add_arg($args, "--language=%s", $path_language);
mtr_add_arg($args, "--skip-grant-tables"); 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= $>; my $euid= $>;
if (!IS_WINDOWS and $euid == 0) { if (!IS_WINDOWS and $euid == 0) {
mtr_add_arg($args, "--user=root"); mtr_add_arg($args, "--user=root");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment