database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mysqld_safe: don't use "$DATADIR/my.cnf"

Browse Source 
finally removed, after being deprecated since 2005
This commit is contained in:
Sergei Golubchik
2016-09-16 07:27:23 +02:00
parent 7fc36e69f7
commit fb8bc59f01
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/mysqld_safe.sh
View File

@@ -550,10 +550,6 @@ fi
if test -d $MY_BASEDIR_VERSION/data/mysql if test -d $MY_BASEDIR_VERSION/data/mysql
then then
DATADIR=$MY_BASEDIR_VERSION/data DATADIR=$MY_BASEDIR_VERSION/data
if test -z "$defaults" -a -r "$DATADIR/my.cnf"
then
defaults="--defaults-extra-file=$DATADIR/my.cnf"
fi
# Next try where the source installs put it # Next try where the source installs put it
elif test -d $MY_BASEDIR_VERSION/var/mysql elif test -d $MY_BASEDIR_VERSION/var/mysql
then then
@@ -565,23 +561,13 @@ fi
if test -z "$MYSQL_HOME" if test -z "$MYSQL_HOME"
then then
if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" if test -r "$DATADIR/my.cnf"
then
log_error "WARNING: Found two instances of my.cnf -
$MY_BASEDIR_VERSION/my.cnf and
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
MYSQL_HOME=$MY_BASEDIR_VERSION
elif test -r "$DATADIR/my.cnf"
then then
log_error "WARNING: Found $DATADIR/my.cnf log_error "WARNING: Found $DATADIR/my.cnf
The data directory is a deprecated location for my.cnf, please move it to The data directory is not a valid location for my.cnf, please move it to
$MY_BASEDIR_VERSION/my.cnf" $MY_BASEDIR_VERSION/my.cnf"
MYSQL_HOME=$DATADIR
else
MYSQL_HOME=$MY_BASEDIR_VERSION
fi fi
MYSQL_HOME=$MY_BASEDIR_VERSION
fi fi
export MYSQL_HOME export MYSQL_HOME