diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-14 21:57:31 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-14 21:57:31 +0000 |
| commit | 6cead7efb7113da3ce6f69ae0e495a25c855b673 (patch) | |
| tree | ad1b4da24da9d3720936d809c0fc115541fc4ce9 /databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh | |
| parent | - update to 3.0 (diff) | |
databases/mariadb100-server: Update to 10.0.29
- Update to 10.0.29
- Update mariadb100-client
- Update patches
- Regen patches with makepatch
- Pet portlint
- Add MROONGA liblz4 dependency
- Fix MROONGA liblz4 linking
- rm erroneously installed files
PR: 197232, 204014, 215901
MFH: 2017Q1
Security: 22373c43-d728-11e6-a9a5-b499baebfeaf
Notes
Notes:
svn path=/head/; revision=431497
Diffstat (limited to 'databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh')
| -rw-r--r-- | databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh index 85ed88461ead..d6f1dcede44d 100644 --- a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh +++ b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh @@ -1,6 +1,6 @@ ---- scripts/mysqld_safe.sh.orig 2015-06-17 14:54:12 UTC +--- scripts/mysqld_safe.sh.orig 2017-01-14 17:25:20 UTC +++ scripts/mysqld_safe.sh -@@ -445,10 +445,10 @@ fi +@@ -469,10 +469,10 @@ fi if test -z "$MYSQL_HOME" then @@ -13,12 +13,12 @@ $DATADIR/my.cnf IGNORING $DATADIR/my.cnf" -@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf" +@@ -481,7 +481,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 |