mirror of
https://git.freebsd.org/ports.git
synced 2025-05-20 11:03:09 -04:00
1f9f34c365
- MySQL version enabled for Galera Replication PR: 214807 Submitted by: Philip Stoev <philip.stoev@galeracluster.com> Reviewed by: matthew, mat, mmokhi Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D9427
24 lines
796 B
Bash
24 lines
796 B
Bash
--- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200
|
|
+++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200
|
|
@@ -242,10 +242,10 @@
|
|
|
|
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"
|
|
|
|
@@ -254,7 +254,7 @@
|
|
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"
|
|
MYSQL_HOME=$DATADIR
|
|
else
|
|
MYSQL_HOME=$MY_BASEDIR_VERSION
|