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
This commit is contained in:
unknown 2007-01-09 09:51:49 +01:00
commit ae9549501b
2 changed files with 7 additions and 0 deletions

View file

@ -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++)
{