diff options
| author | tsmith/tim@siva.hindu.god <> | 2006-12-21 18:23:14 -0700 |
|---|---|---|
| committer | tsmith/tim@siva.hindu.god <> | 2006-12-21 18:23:14 -0700 |
| commit | 8075fc447e0fe2dee0926b9f0d26275d50db5130 (patch) | |
| tree | 098f0b40b44fba7320edd47b145d57749db01be9 /scripts/mysqld_multi.sh | |
| parent | c862eae163c1ca4718aa05ce7e8edfdc2827263e (diff) | |
| parent | 1341cf1827092bac4723f3c6fc602069d62ca0b3 (diff) | |
| download | mariadb-git-8075fc447e0fe2dee0926b9f0d26275d50db5130.tar.gz | |
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
into siva.hindu.god:/usr/home/tim/m/bk/51
Diffstat (limited to 'scripts/mysqld_multi.sh')
| -rw-r--r-- | scripts/mysqld_multi.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index c9c0b21b584..91afe49b46b 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++) { @@ -719,7 +719,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 |