Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work-24780

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work-24780


scripts/mysqld_multi.sh:
  Auto merged

2 files changed, 7 insertions, 0 deletions

diff --git a/scripts/mysqlaccess.sh b/scripts/mysqlaccess.sh
index 22e9d121f9a..bcaf9f8af8e 100644
--- a/scripts/mysqlaccess.sh
+++ b/scripts/mysqlaccess.sh
@@ -465,6 +465,9 @@ MySQLaccess::Report::Print_Header();
   elsif (-f "@sysconfdir@/$script_conf") {
      require "@sysconfdir@/$script_conf";
   }
+  elsif (-f "/etc/$script_conf") {
+     require "/etc/$script_conf";
+  }
 
 # ****************************
 # Read in all parameters
@@ -930,6 +933,7 @@ sub MergeConfigFile {
 sub MergeConfigFiles {
     my ($name,$pass,$uid,$gid,$quota,$comment,$gcos,$dir,$shell) = getpwuid $<;
     MergeConfigFile("@sysconfdir@/my.cnf");
+    MergeConfigFile("/etc/my.cnf");
     MergeConfigFile("$dir/.my.cnf");
 }
 
diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 12758ae8290..c86f88f3fc0 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -467,6 +467,9 @@ sub find_groups
     if (-f "@sysconfdir@/my.cnf" && -r "@sysconfdir@/my.cnf")
     {
       open(MY_CNF, "<@sysconfdir@/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
+    } elsif (-f "/etc/my.cnf" && -r "/etc/my.cnf")
+    {
+      open(MY_CNF, "</etc/my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);
     }
     for ($i = 0; ($line = shift @tmp); $i++)
     {