diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2017-01-09 16:40:25 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2017-01-09 16:40:25 +0000 |
| commit | 1e2f7ff6cdb44b310ec1d86b87965adb9849e6d2 (patch) | |
| tree | 8c558affbe41469b828f5f2de5e07c9e244bd6ab /databases | |
| parent | 0274aab9394f67aa6134db3261f7797d04fc9388 (diff) | |
| download | ports-1e2f7ff6cdb44b310ec1d86b87965adb9849e6d2.tar.gz ports-1e2f7ff6cdb44b310ec1d86b87965adb9849e6d2.zip | |
Fix patch.
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=430977
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh b/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh index 2a30469922f0..a2d582ec94be 100644 --- a/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh +++ b/databases/mariadb55-server/files/patch-scripts_mysqld_safe.sh @@ -1,6 +1,6 @@ ---- 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 @@ +--- scripts/mysqld_safe.sh.orig 2017-01-09 14:36:43 UTC ++++ scripts/mysqld_safe.sh +@@ -468,10 +468,10 @@ fi if test -z "$MYSQL_HOME" then @@ -13,12 +13,12 @@ $DATADIR/my.cnf IGNORING $DATADIR/my.cnf" -@@ -254,7 +254,7 @@ +@@ -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 - MYSQL_HOME=$MY_BASEDIR_VERSION |