summaryrefslogtreecommitdiff
path: root/scripts/mysqld_multi.sh
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2007-01-09 09:32:56 +0100
committerunknown <df@kahlann.erinye.com>2007-01-09 09:32:56 +0100
commit81cf3b8051bfda2c23cc96fa78c6362253fa48ff (patch)
tree856d84b766dbb0e6f6001060af3fe832276d27a8 /scripts/mysqld_multi.sh
parentc9149b9c481948e4dcdc4c81784ed4fa06ae061a (diff)
downloadmariadb-git-81cf3b8051bfda2c23cc96fa78c6362253fa48ff.tar.gz
BUG#24780 workaround for broken installations that depend on using /etc, but were configured differently
scripts/mysqlaccess.sh: also look in /etc scripts/mysqld_multi.sh: also look in /etc
Diffstat (limited to 'scripts/mysqld_multi.sh')
-rw-r--r--scripts/mysqld_multi.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index ce778c03206..8b435161e47 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -432,6 +432,9 @@ sub find_groups
if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
{
open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+ } elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+ {
+ open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
}
for ($i = 0; ($line = shift @tmp); $i++)
{