Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-scripts_mysqld__safe.sh
- This file was copied from databases/mysql56-server/files/patch-scripts_mysqld_safe.sh.
| --- scripts/mysqld_safe.sh.orig 2007-10-08 10:39:23.000000000 +0200 | --- scripts/mysqld_safe.sh.orig 2017-02-02 08:29:11 UTC | ||||
| +++ scripts/mysqld_safe.sh 2007-10-08 10:40:52.000000000 +0200 | +++ scripts/mysqld_safe.sh | ||||
| @@ -242,10 +242,10 @@ | @@ -546,10 +546,10 @@ fi | ||||
| if test -z "$MYSQL_HOME" | if test -z "$MYSQL_HOME" | ||||
| then | then | ||||
| - if test -r "$MY_BASEDIR_VERSION/my.cnf" && test -r "$DATADIR/my.cnf" | - 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" | + if test -r "$MY_BASEDIR_VERSION/etc/my.cnf" && test -r "$DATADIR/my.cnf" | ||||
| then | then | ||||
| log_error "WARNING: Found two instances of my.cnf - | log_error "WARNING: Found two instances of my.cnf - | ||||
| -$MY_BASEDIR_VERSION/my.cnf and | -$MY_BASEDIR_VERSION/my.cnf and | ||||
| +$MY_BASEDIR_VERSION/etc/my.cnf and | +$MY_BASEDIR_VERSION/etc/my.cnf and | ||||
| $DATADIR/my.cnf | $DATADIR/my.cnf | ||||
| IGNORING $DATADIR/my.cnf" | IGNORING $DATADIR/my.cnf" | ||||
| @@ -254,7 +254,7 @@ | @@ -558,7 +558,7 @@ IGNORING $DATADIR/my.cnf" | ||||
| then | then | ||||
| log_error "WARNING: Found $DATADIR/my.cnf | log_error "WARNING: Found $DATADIR/my.cnf | ||||
| The data directory is a deprecated location for my.cnf, please move it to | The data directory is a deprecated location for my.cnf, please move it to | ||||
| -$MY_BASEDIR_VERSION/my.cnf" | -$MY_BASEDIR_VERSION/my.cnf" | ||||
| +$MY_BASEDIR_VERSION/etc/my.cnf" | +$MY_BASEDIR_VERSION/etc/my.cnf" | ||||
| MYSQL_HOME=$DATADIR | MYSQL_HOME=$DATADIR | ||||
| else | else | ||||
| MYSQL_HOME=$MY_BASEDIR_VERSION | MYSQL_HOME=$MY_BASEDIR_VERSION | ||||