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

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

Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
065ab153 · mtaylor@qualinost.(none) · f7499225 · 58ae89cb · 065ab153
Commit 065ab153 authored Jan 26, 2007 by mtaylor@qualinost.(none)
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

scripts/mysqld_multi.sh scripts/mysqld_multi.sh +0 -8

No files found.
--- 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);