forked from Lainports/opnsense-ports
24 lines
762 B
Bash
24 lines
762 B
Bash
--- 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
|