diff options
| author | unknown <df@kahlann.erinye.com> | 2007-01-09 09:51:49 +0100 |
|---|---|---|
| committer | unknown <df@kahlann.erinye.com> | 2007-01-09 09:51:49 +0100 |
| commit | ae9549501bf601cb86e6530e4daaf1bca833e65b (patch) | |
| tree | 48e2fce3dbb4ea936bd46ffd2cb442747c3cb213 /scripts/mysqld_multi.sh | |
| parent | 6bd8dc73f8561966d9c98ca2489ada497cb6cb49 (diff) | |
| parent | 81cf3b8051bfda2c23cc96fa78c6362253fa48ff (diff) | |
| download | mariadb-git-ae9549501bf601cb86e6530e4daaf1bca833e65b.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
scripts/mysqld_multi.sh:
Auto merged
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 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++) { |