Skip to content

Commit bdb7a3e

Browse files
author
Jim Winstead
committed
mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe,
as well as some unclear example paths. (Bug #28094)
1 parent 55e33e6 commit bdb7a3e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scripts/mysqld_multi.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ sub start_mysqlds()
316316
$tmp.= " $options[$j]";
317317
}
318318
}
319-
if ($opt_verbose && $com =~ m/\/safe_mysqld$/ && !$info_sent)
319+
if ($opt_verbose && $com =~ m/\/(safe_mysqld|mysqld_safe)$/ && !$info_sent)
320320
{
321-
print "WARNING: safe_mysqld is being used to start mysqld. In this case you ";
321+
print "WARNING: $1 is being used to start mysqld. In this case you ";
322322
print "may need to pass\n\"ledir=...\" under groups [mysqldN] to ";
323-
print "safe_mysqld in order to find the actual mysqld binary.\n";
323+
print "$1 in order to find the actual mysqld binary.\n";
324324
print "ledir (library executable directory) should be the path to the ";
325325
print "wanted mysqld binary.\n\n";
326326
$info_sent= 1;
@@ -670,9 +670,9 @@ language = @datadir@/mysql/english
670670
user = unix_user1
671671
672672
[mysqld3]
673-
mysqld = /path/to/safe_mysqld/safe_mysqld
673+
mysqld = /path/to/mysqld_safe
674674
ledir = /path/to/mysqld-binary/
675-
mysqladmin = /path/to/mysqladmin/mysqladmin
675+
mysqladmin = /path/to/mysqladmin
676676
socket = /tmp/mysql.sock3
677677
port = 3308
678678
pid-file = @localstatedir@3/hostname.pid3

0 commit comments

Comments
 (0)