summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2017-01-20 18:21:49 +0000
committerMark Felder <feld@FreeBSD.org>2017-01-20 18:21:49 +0000
commit37b41c2bb952528125ef0b77be3653d36f4181e4 (patch)
treeb3c947132dda608e405cdee619157b9243ab8832
parentdatabases/memcached: temporarily hide DTRACE option on aarch64 (diff)
databases/mysql56-server: Do not install my.cnf sample
An issue was discovered where users of mysql did not have a my.cnf and the recent update was causing mysqld to find a sample my.cnf and load its parameters. This was causing errors on startup for users of innodb as the parameters used to init the database did not match the ones in the sample config file it was now reading.
Notes
Notes: svn path=/head/; revision=431975
-rw-r--r--databases/mysql56-server/Makefile2
-rw-r--r--databases/mysql56-server/pkg-plist2
2 files changed, 2 insertions, 2 deletions
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 162bd5639f47..725de9adaf4f 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= mysql
PORTVERSION= 5.6.35
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-5.6
PKGNAMESUFFIX?= 56-server
diff --git a/databases/mysql56-server/pkg-plist b/databases/mysql56-server/pkg-plist
index 04c52cb9b820..6ab4ddb6233b 100644
--- a/databases/mysql56-server/pkg-plist
+++ b/databases/mysql56-server/pkg-plist
@@ -132,7 +132,7 @@ man/man8/mysqld.8.gz
%%DATADIR%%/spanish/errmsg.sys
%%DATADIR%%/swedish/errmsg.sys
%%DATADIR%%/ukrainian/errmsg.sys
-@sample(root,wheel,0644) %%ETCDIR%%/my.cnf.sample
+%%ETCDIR%%/my.cnf.sample
@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
@dir(mysql,mysql,0750) %%MY_SECDIR%%
@dir(mysql,mysql,0750) %%MY_TMPDIR%%