From 15e183501e8ee93c29cdc6cf3985cc48733e05d1 Mon Sep 17 00:00:00 2001
From: unknown <mtaylor@qualinost.(none)>
Date: Fri, 15 Dec 2006 12:34:36 -0800
Subject: Added /etc/mysql to my.cnf search path after /etc. bug #25104

mysys/default.c:
  Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
  Added /etc/mysql to the my.cnf search path.
  Changed chop to chomp - since it's smarter.
---
 scripts/mysqld_multi.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'scripts/mysqld_multi.sh')

diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 2dcc8dc7bc4..6ac31a00c75 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -472,6 +472,14 @@ 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 (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&
 	-r "$ENV{MYSQL_HOME}/my.cnf")
     {
@@ -491,7 +499,7 @@ sub find_groups
       $data[$i] = $line;
     }
   }
-  chop @data;
+  chomp @data;
   # Make a list of the wanted group ids
   if (defined($raw_gids))
   {
-- 
cgit v1.2.1


From 89ac44e1a2a7822e59e1bd077274987d36a03abd Mon Sep 17 00:00:00 2001
From: unknown <mtaylor@qualinost.(none)>
Date: Fri, 15 Dec 2006 16:17:10 -0800
Subject: support /etc/mysql/my.cnf in mysqld_multi as well.

---
 scripts/mysqld_multi.sh | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'scripts/mysqld_multi.sh')

diff --git a/scripts/mysqld_multi.sh b/scripts/mysqld_multi.sh
index 4a6f380494f..b11dc7394bf 100644
--- a/scripts/mysqld_multi.sh
+++ b/scripts/mysqld_multi.sh
@@ -437,6 +437,14 @@ 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);
@@ -446,7 +454,7 @@ sub find_groups
       $data[$i] = $line;
     }
   }
-  chop @data;
+  chomp @data;
   # Make a list of the wanted group ids
   if (defined($raw_gids))
   {
-- 
cgit v1.2.1