From 0c75fbb3c4e610f9fd69acf2753acfd388dff352 Mon Sep 17 00:00:00 2001
From: unknown <mtaylor@qualinost.(none)>
Date: Fri, 26 Jan 2007 12:00:38 -0800
Subject: [PATCH] User visible change - breaks some environments, per Paul
 DuBois. Reverting in 4.1 and 5.0.

---
 mysys/default.c         | 1 -
 scripts/mysqld_multi.sh | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/mysys/default.c b/mysys/default.c
index 1d71399ef71..6e40c48d82a 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -49,7 +49,6 @@ const char *default_directories[]= {
 "sys:/etc/",
 #else
 "/etc/",
-"/etc/mysql/",
 #endif
 #ifdef DATADIR
 DATADIR,
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);