From: Date: December 15 2006 9:34pm
Subject: bk commit into 5.0 tree (mtaylor:1.2354) BUG#25104
List-Archive: http://lists.mysql.com/commits/17078
X-Bug: 25104
Message-Id: <E1GvJlT-0004qp-MS@localhost.localdomain>

Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor 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, 2006-12-15 12:34:36-08:00, mtaylor@qualinost.(none) +2 -0
  Added /etc/mysql to my.cnf search path after /etc. 
  bug #25104

  mysys/default.c@stripped, 2006-12-15 12:34:33-08:00, mtaylor@qualinost.(none) +6 -4
    Added /etc/mysql to the search path after /etc. 

  scripts/mysqld_multi.sh@stripped, 2006-12-15 12:34:33-08:00, mtaylor@qualinost.(none) +9 -1
    Added /etc/mysql to the my.cnf search path.
    Changed chop to chomp - since it's smarter. 

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql-5.0-maint

--- 1.83/mysys/default.c	2006-12-15 12:34:43 -08:00
+++ 1.84/mysys/default.c	2006-12-15 12:34:43 -08:00
@@ -979,10 +979,11 @@
 
   Everywhere else, this is:
     1. /etc/
-    2. getenv(DEFAULT_HOME_ENV)
-    3. ""
-    4. "~/"
-    5. --sysconfdir=<path>
+    2. /etc/mysql/
+    3. getenv(DEFAULT_HOME_ENV)
+    4. ""
+    5. "~/"
+    6. --sysconfdir=<path>
 
  */
 
@@ -1008,6 +1009,7 @@
     *ptr++= env;
 #endif
   *ptr++= "/etc/";
+  *ptr++= "/etc/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;

--- 1.30/scripts/mysqld_multi.sh	2006-12-15 12:34:43 -08:00
+++ 1.31/scripts/mysqld_multi.sh	2006-12-15 12:34:43 -08:00
@@ -472,6 +472,14 @@
     {
       $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 (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&
 	-r "$ENV{MYSQL_HOME}/my.cnf")
     {
@@ -491,7 +499,7 @@
       $data[$i] = $line;
     }
   }
-  chop @data;
+  chomp @data;
   # Make a list of the wanted group ids
   if (defined($raw_gids))
   {