mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe,

as well as some unclear example paths. (Bug #28094)
This commit is contained in:
Jim Winstead 2009-04-28 11:28:03 -07:00
parent 55e33e6292
commit bdb7a3e8a9

View File

@ -316,11 +316,11 @@ sub start_mysqlds()
$tmp.= " $options[$j]"; $tmp.= " $options[$j]";
} }
} }
if ($opt_verbose && $com =~ m/\/safe_mysqld$/ && !$info_sent) if ($opt_verbose && $com =~ m/\/(safe_mysqld|mysqld_safe)$/ && !$info_sent)
{ {
print "WARNING: safe_mysqld is being used to start mysqld. In this case you "; print "WARNING: $1 is being used to start mysqld. In this case you ";
print "may need to pass\n\"ledir=...\" under groups [mysqldN] to "; print "may need to pass\n\"ledir=...\" under groups [mysqldN] to ";
print "safe_mysqld in order to find the actual mysqld binary.\n"; print "$1 in order to find the actual mysqld binary.\n";
print "ledir (library executable directory) should be the path to the "; print "ledir (library executable directory) should be the path to the ";
print "wanted mysqld binary.\n\n"; print "wanted mysqld binary.\n\n";
$info_sent= 1; $info_sent= 1;
@ -670,9 +670,9 @@ language = @datadir@/mysql/english
user = unix_user1 user = unix_user1
[mysqld3] [mysqld3]
mysqld = /path/to/safe_mysqld/safe_mysqld mysqld = /path/to/mysqld_safe
ledir = /path/to/mysqld-binary/ ledir = /path/to/mysqld-binary/
mysqladmin = /path/to/mysqladmin/mysqladmin mysqladmin = /path/to/mysqladmin
socket = /tmp/mysql.sock3 socket = /tmp/mysql.sock3
port = 3308 port = 3308
pid-file = @localstatedir@3/hostname.pid3 pid-file = @localstatedir@3/hostname.pid3