diff options
author | df@kahlann.erinye.com <> | 2007-01-22 16:34:22 +0100 |
---|---|---|
committer | df@kahlann.erinye.com <> | 2007-01-22 16:34:22 +0100 |
commit | 1b8b33bf83c623f13f970e1f07084cc90c82ab69 (patch) | |
tree | 21e9967a48eed27b308690a115ea0acd6f2a2c08 /scripts/mysqld_multi.sh | |
parent | 205f7a0583f5ba5cc0c6428fa6e44c74b534d8e8 (diff) | |
parent | b3eadd2b74c96f0c71195b4d744e3d72097cf690 (diff) | |
download | mariadb-git-1b8b33bf83c623f13f970e1f07084cc90c82ab69.tar.gz |
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
Diffstat (limited to 'scripts/mysqld_multi.sh')
-rw-r--r-- | scripts/mysqld_multi.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh index 91afe49b46b..a68ee7fed28 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++) { |