From 6e9b26e8b75422959b48c673b5f6abeae7fa69ad Mon Sep 17 00:00:00 2001
From: "jani@ua141d10.elisa.omakaista.fi" <>
Date: Wed, 23 Feb 2005 18:59:54 +0200
Subject: [PATCH] Fixed a compatibility problem. 1) If my.cnf is found in
 datadir and basedir, give a warning and use the    one in basedir. 2) If
 my.cnf is found in datadir, use it, but give a warning. 3) No warning if
 my.cnf is in basedir.

---
 scripts/mysqld_safe.sh | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index a8615ff2113..e38127ffd8e 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -128,15 +128,28 @@ then
 else
   MY_BASEDIR_VERSION=@prefix@
   DATADIR=@localstatedir@
-  if test -z "$MYSQL_HOME"
-  then 
-    MYSQL_HOME=$DATADIR                 # Installation in a not common path
-  fi
   ledir=@libexecdir@
 fi
+
 if test -z "$MYSQL_HOME"
 then 
-  MYSQL_HOME=$MY_BASEDIR_VERSION
+  if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
+  then
+    echo "WARNING: Found two instances of my.cnf -"
+    echo "$MY_BASEDIR_VERSION/my.cnf and"
+    echo "$DATADIR/my.cnf"
+    echo "IGNORING $DATADIR/my.cnf"
+    echo
+    MYSQL_HOME=$MY_BASEDIR_VERSION
+  elif test -r "$DATADIR/my.cnf"
+  then
+    echo "WARNING: Found $DATADIR/my.cnf"
+    echo "Datadir is deprecated place for my.cnf, please move it to $MY_BASEDIR_VERSION"
+    echo
+    MYSQL_HOME=$DATADIR
+  else
+    MYSQL_HOME=$MY_BASEDIR_VERSION
+  fi
 fi
 export MYSQL_HOME