Commit a53d794f authored by Sergei Golubchik's avatar Sergei Golubchik

mtr: don't use --mysqld= options when issuing "mysqld --help"

(and don't append --user=root for --help now, when mysqld has a fix for that)
parent a0ea7ffa
...@@ -1864,22 +1864,9 @@ sub collect_mysqld_features { ...@@ -1864,22 +1864,9 @@ sub collect_mysqld_features {
mtr_add_arg($args, "--lc-messages-dir=%s", $path_language); mtr_add_arg($args, "--lc-messages-dir=%s", $path_language);
mtr_add_arg($args, "--skip-grant-tables"); mtr_add_arg($args, "--skip-grant-tables");
mtr_add_arg($args, "--log-warnings=0"); mtr_add_arg($args, "--log-warnings=0");
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");
}
mtr_add_arg($args, "--verbose"); mtr_add_arg($args, "--verbose");
mtr_add_arg($args, "--help"); mtr_add_arg($args, "--help");
# Need --user=root if running as *nix root user
if (!IS_WINDOWS and $> == 0)
{
mtr_add_arg($args, "--user=root");
}
my $exe_mysqld= find_mysqld($bindir); my $exe_mysqld= find_mysqld($bindir);
my $cmd= join(" ", $exe_mysqld, @$args); my $cmd= join(" ", $exe_mysqld, @$args);
......
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