From c29d22c96dd972c890cce5fc3a27138c50a4ce37 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 7 Dec 2006 15:02:32 +0100 Subject: BUG#24780 use --sysconfdir in scripts scripts/Makefile.am: pass --sysconfdir to scripts scripts/mysqlaccess.sh: use --sysconfdir instead of hardcoded /etc scripts/mysqld_multi.sh: use --sysconfdir instead of hardcoded /etc --- scripts/mysqld_multi.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/mysqld_multi.sh') diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 4a6f380494f..ce778c03206 100644 --- a/scripts/mysqld_multi.sh +++ b/scripts/mysqld_multi.sh @@ -429,9 +429,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, ") && close(MY_CNF); + open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=) && close(MY_CNF); } for ($i = 0; ($line = shift @tmp); $i++) { @@ -658,7 +658,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 -- cgit v1.2.1