diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2015-08-12 13:19:36 +0000 |
| commit | 4af533cdd3b05dd2ffa3f86bd7fb3e3b34712ebf (patch) | |
| tree | 9eb7da1ac6becd20e72014281649419132f02d48 /databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh | |
| parent | Update to ocurl 0.7.5 (bugfix release) (diff) | |
databases/mariadb100-server: Update to 10.0.21
- Update to 10.0.21
- Updates mariadb100-client as well (slave-port)
- Silence portlint
- Re-roll patches with makepatch
[1] https://mariadb.atlassian.net/browse/MDEV-7398
[2] https://mariadb.atlassian.net/browse/MDEV-8128
Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/
Differential revision: https://reviews.freebsd.org/D2771
Reviewed by: koobs (mentor), vsevolod (mentor)
Approved by: vsevolod (mentor)
PR: 200097
Security: 36bd352d-299b-11e5-86ff-14dae9d210b8
MFH: 2015Q3
Notes
Notes:
svn path=/head/; revision=394020
Diffstat (limited to 'databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh')
| -rw-r--r-- | databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh new file mode 100644 index 000000000000..85ed88461ead --- /dev/null +++ b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh @@ -0,0 +1,24 @@ +--- 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 |