Commit 607af5c6 authored by unknown's avatar unknown
Browse files

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint 

into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint


scripts/mysqld_multi.sh:
  Auto merged
parents fad8db22 3c04f839

scripts/mysqld_multi.sh

+8 −0
Original line number Diff line number Diff line
@@ -490,6 +490,14 @@ sub find_groups 
    {

      $data[$i] = $line;

    }

    if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")

    {

      open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);

    }

    for (; ($line = shift @tmp); $i++)

    {

      $data[$i] = $line;

    }

    if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")

    {

      open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);