blob: d6f1dcede44dd284eb1d1cab7d33c5b65aeb9f11 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
--- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC
+++ scripts/mysqld_safe.sh
@@ -469,10 +469,10 @@ fi
if test -z "$MYSQL_HOME"
then
- if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf"
+ if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf"
then
log_error "WARNING: Found two instances of my.cnf -
-$MY_BASEDIR_VERSION/my.cnf and
+$MY_BASEDIR_VERSION/etc/my.cnf and
$DATADIR/my.cnf
IGNORING $DATADIR/my.cnf"
@@ -481,7 +481,7 @@ IGNORING $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
-$MY_BASEDIR_VERSION/my.cnf"
+$MY_BASEDIR_VERSION/etc/my.cnf"
unsafe_my_cnf=1
MYSQL_HOME=$DATADIR
else
|
