mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 19:13:27 -04:00
e1822696f3
- Bugfix update to 5.5.56 - Re-roll patches - Convert patches to new naming convention - Add/move ldconfig config to -server - Move client option to -client port
24 lines
762 B
Bash
24 lines
762 B
Bash
--- scripts/mysqld_safe.sh.orig 2017-04-30 11:09:31 UTC
|
|
+++ scripts/mysqld_safe.sh
|
|
@@ -468,10 +468,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"
|
|
|
|
@@ -480,7 +480,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
|