User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.

1 files changed, 0 insertions, 8 deletions

diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 48e64a6b541..54662d2c017 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -437,14 +437,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);