Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC | |||||
| +++ scripts/mysqld_safe.sh | |||||
| @@ -445,10 +445,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" | |||||
| @@ -457,7 +457,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" | |||||
| MYSQL_HOME=$DATADIR | |||||
| else | |||||
| MYSQL_HOME=$MY_BASEDIR_VERSION | |||||