diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-16 07:27:23 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-09-19 20:13:49 +0200 |
| commit | fb8bc59f0120fbd3517a291e71d81c3d11443baa (patch) | |
| tree | 5db53f2400761a9a76815d1d2dc8065eebc616ed | |
| parent | 7fc36e69f7b522cfbb31bae01f7e8a405f79ca90 (diff) | |
| download | mariadb-git-fb8bc59f0120fbd3517a291e71d81c3d11443baa.tar.gz | |
mysqld_safe: don't use "$DATADIR/my.cnf"
finally removed, after being deprecated since 2005
| -rw-r--r-- | scripts/mysqld_safe.sh | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 07bca1c0318..e37f512b0f3 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -550,10 +550,6 @@ fi if test -d $MY_BASEDIR_VERSION/data/mysql then 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 elif test -d $MY_BASEDIR_VERSION/var/mysql then @@ -565,23 +561,13 @@ fi if test -z "$MYSQL_HOME" then - if test -r "$MY_BASEDIR_VERSION/my.cnf" && 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" + if test -r "$DATADIR/my.cnf" then 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" - MYSQL_HOME=$DATADIR - else - MYSQL_HOME=$MY_BASEDIR_VERSION fi + MYSQL_HOME=$MY_BASEDIR_VERSION fi export MYSQL_HOME |