summaryrefslogtreecommitdiff
path: root/scripts/mysqld_multi.sh
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2006-12-07 15:13:12 +0100
committerunknown <df@kahlann.erinye.com>2006-12-07 15:13:12 +0100
commit8ea92111a34708953694882f4c766a179a4871b5 (patch)
treea8e36a65cad51a2bef23b7f9a5471b597f37f7ba /scripts/mysqld_multi.sh
parentdb2a5783a0f1583120e4e5b5b3ce2078177cd497 (diff)
parentc29d22c96dd972c890cce5fc3a27138c50a4ce37 (diff)
downloadmariadb-git-8ea92111a34708953694882f4c766a179a4871b5.tar.gz
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work scripts/Makefile.am: Auto merged scripts/mysqld_multi.sh: Auto merged
Diffstat (limited to 'scripts/mysqld_multi.sh')
-rw-r--r--scripts/mysqld_multi.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 2dcc8dc7bc4..12758ae8290 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -464,9 +464,9 @@ sub find_groups
}
else
{
- if (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+ if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
{
- open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+ open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
}
for ($i = 0; ($line = shift @tmp); $i++)
{
@@ -703,7 +703,7 @@ sub example
# (as per Linux/Unix standard). You may even replace the
# /etc/init.d/mysql.server script with it.
#
-# Before using, you must create a my.cnf file either in /etc/my.cnf
+# Before using, you must create a my.cnf file either in @sysconfdir@/my.cnf
# or /root/.my.cnf and add the [mysqld_multi] and [mysqld#] groups.
#
# The script can be found from support-files/mysqld_multi.server.sh