summaryrefslogtreecommitdiff
path: root/scripts/mysqld_multi.sh
diff options
context:
space:
mode:
authordf@kahlann.erinye.com <>2007-01-09 09:51:49 +0100
committerdf@kahlann.erinye.com <>2007-01-09 09:51:49 +0100
commitb3eadd2b74c96f0c71195b4d744e3d72097cf690 (patch)
tree48e2fce3dbb4ea936bd46ffd2cb442747c3cb213 /scripts/mysqld_multi.sh
parent6978046efc743a22e7d67422371e490e8410a6bb (diff)
parenteeb82a8ed5a0415737c12ecc4ec97708461d5081 (diff)
downloadmariadb-git-b3eadd2b74c96f0c71195b4d744e3d72097cf690.tar.gz
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
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 12758ae8290..c86f88f3fc0 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -467,6 +467,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++)
{