bk commit into 4.1 tree (df:1.2593) BUG#24780

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
4.1 repository of df. When df does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-09 09:32:56+01:00, df@stripped +2 -0
  BUG#24780 workaround for broken installations that depend on using /etc, but were
configured differently

  scripts/mysqlaccess.sh@stripped, 2007-01-09 09:32:55+01:00, df@stripped +4 -0
    also look in /etc

  scripts/mysqld_multi.sh@stripped, 2007-01-09 09:32:55+01:00, df@stripped +3 -0
    also look in /etc

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	df
# Host:	kahlann.erinye.com
# Root:	/home/df/mysql/build/mysql-4.1-build-work-24780

--- 1.11/scripts/mysqlaccess.sh	2006-12-07 15:02:31 +01:00
+++ 1.12/scripts/mysqlaccess.sh	2007-01-09 09:32:55 +01:00
@@ -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");
 }
 

--- 1.24/scripts/mysqld_multi.sh	2006-12-07 15:02:31 +01:00
+++ 1.25/scripts/mysqld_multi.sh	2007-01-09 09:32:55 +01:00
@@ -432,6 +432,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++)
     {