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

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

Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into qualinost.(none):/home/mtaylor/src/mysql-5.1-maint
ca0f2e85 · mtaylor@qualinost.(none) · 3a682ca7 · 7f3d0c92 · ca0f2e85
Commit ca0f2e85 authored Dec 15, 2006 by mtaylor@qualinost.(none)
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

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

No files found.
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -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);