summaryrefslogtreecommitdiff
path: root/scripts/mysqld_multi.sh
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-04-28 11:28:03 -0700
committerJim Winstead <jimw@mysql.com>2009-04-28 11:28:03 -0700
commita9a322e11ff601e72585d426fe7c9d0fdab5aa69 (patch)
treef110f8ff41b7b7ef5af079d93d9b99d051dccde4 /scripts/mysqld_multi.sh
parent23116951ae201ed4b492c186ec09817a4df6e1fa (diff)
downloadmariadb-git-a9a322e11ff601e72585d426fe7c9d0fdab5aa69.tar.gz
mysqld_multi still had mentions of safe_mysqld instead of mysqld_safe,
as well as some unclear example paths. (Bug #28094)
Diffstat (limited to 'scripts/mysqld_multi.sh')
-rw-r--r--scripts/mysqld_multi.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 3cb4665eb1c..f35be69c151 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -316,11 +316,11 @@ sub start_mysqlds()
$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 "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 "wanted mysqld binary.\n\n";
$info_sent= 1;
@@ -670,9 +670,9 @@ language = @datadir@/mysql/english
user = unix_user1
[mysqld3]
-mysqld = /path/to/safe_mysqld/safe_mysqld
+mysqld = /path/to/mysqld_safe
ledir = /path/to/mysqld-binary/
-mysqladmin = /path/to/mysqladmin/mysqladmin
+mysqladmin = /path/to/mysqladmin
socket = /tmp/mysql.sock3
port = 3308
pid-file = @localstatedir@3/hostname.pid3