Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280)

This commit is contained in:
jimw@mysql.com 2005-08-31 10:23:29 -07:00
parent 298af8ccb9
commit 2ef8b1e7de

View file

@ -289,8 +289,10 @@ sub start_mysqlds()
}
else
{
$options[$j]=~ s/;/\\;/g;
$tmp.= " $options[$j]";
# we single-quote the argument, but first convert single-quotes to
# '"'"' so they are passed through correctly
$options[$j]=~ s/'/'"'"'/g;
$tmp.= " '$options[$j]'";
}
}
if ($opt_verbose && $com =~ m/\/safe_mysqld$/ && !$info_sent)
@ -374,7 +376,12 @@ sub get_mysqladmin_options
$mysqladmin_found= 0 if (!length($mysqladmin));
$com = "$mysqladmin";
$tmp = " -u $opt_user";
$tmp.= defined($opt_password) ? " -p$opt_password" : "";
if (defined($opt_password)) {
my $pw= $opt_password;
# Protect single quotes in password
$pw =~ s/'/'"'"'/g;
$tmp.= " -p'$pw'";
}
$tmp.= $opt_tcp_ip ? " -h 127.0.0.1" : "";
for ($j = 0; defined($options[$j]); $j++)
{