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.

1 files changed, 6 insertions, 4 deletions

diff --git a/mysys/default.c b/mysys/default.c
index d93f4135e73..a147163e938 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -979,10 +979,11 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
 
   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 @@ static void init_default_directories()
     *ptr++= env;
 #endif
   *ptr++= "/etc/";
+  *ptr++= "/etc/mysql/";
 #endif
   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
     *ptr++= env;