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

mtaylor@qualinost.(none) · mtaylor@qualinost.(none) · commit 065ab1537a80 · 2007-01-26T12:13:59.000-08:00
into  qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
@@ -490,14 +490,6 @@ 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);

Original file line number	Diff line number	Diff line change
`@@ -490,14 +490,6 @@ sub find_groups`
`490`	`490`	`{`
`491`	`491`	`$data[$i] = $line;`
`492`	`492`	`}`
`493`		`- if (-f "/etc/mysql/my.cnf" && -r "/etc/mysql/my.cnf")`
`494`		`- {`
`495`		`- open(MY_CNF, "</etc/mysql/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);`
`496`		`- }`
`497`		`- for (; ($line = shift @tmp); $i++)`
`498`		`- {`
`499`		`- $data[$i] = $line;`
`500`		`- }`
`501`	`493`	`if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")`
`502`	`494`	`{`
`503`	`495`	`open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);`