mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed a compatibility problem.

Browse source 
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.
This commit is contained in:
jani@ua141d10.elisa.omakaista.fi 2005-02-23 18:59:54 +02:00
parent f3c0e35e9f
commit 6e9b26e8b7
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
scripts/mysqld_safe.sh
View file

@ -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