mirror of
https://git.freebsd.org/ports.git
synced 2025-05-16 01:01:49 -04:00
d2bcf058dc
PR: 193539 Submitted by: spil.oss (gmail) MariaDB is a database server that offers drop-in replacement functionality for MySQL. MariaDB is built by some of the original authors of MySQL, with assistance from the broader community of Free and open source software developers. In addition to the core functionality of MySQL, MariaDB offers a rich set of feature enhancements including alternate storage engines, server optimizations, and patches.
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
|
|
@@ -235,10 +235,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"
|
|
|
|
@@ -247,7 +247,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
|