diff options
Diffstat (limited to 'databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh')
| -rw-r--r-- | databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh new file mode 100644 index 000000000000..efd0873733bb --- /dev/null +++ b/databases/mariadb55-server/files/patch-scripts_mysqld__safe.sh @@ -0,0 +1,24 @@ +--- 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 |