From 546097b95f94e88bb8f0c8fd33223c9ee75705db Mon Sep 17 00:00:00 2001
From: unknown <monty@mashka.mysql.fi>
Date: Mon, 28 Apr 2003 12:00:04 +0300
Subject: Use my.cnf file from datadir even if datadir is different from the
 default one.

---
 support-files/mysql.server.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh
index 1e328a4f625..de01142beac 100644
--- a/support-files/mysql.server.sh
+++ b/support-files/mysql.server.sh
@@ -118,7 +118,18 @@ else
   test -z "$print_defaults" && print_defaults="my_print_defaults"
 fi
 
-parse_arguments `$print_defaults mysqld mysql_server mysql.server`
+#
+# Test if someone changed datadir;  In this case we should also read the
+# default arguments from this directory
+#
+
+extra_args=""
+if test "$datadir" != "@localstatedir@"
+then
+  extra_args="-e $datadir/my.cnf"
+fi
+
+parse_arguments `$print_defaults $extra_args mysqld mysql_server mysql.server`
 
 # Safeguard (relative paths, core dumps..)
 cd $basedir
-- 
cgit v1.2.1