diff options
author | riggs <riggs@FreeBSD.org> | 2016-02-07 16:08:20 +0800 |
---|---|---|
committer | riggs <riggs@FreeBSD.org> | 2016-02-07 16:08:20 +0800 |
commit | 4b9f7d9de7e094ed67daa5bb425b295cdeeb0ddc (patch) | |
tree | 8cc9773093b3a8d4df8e10102d481e08b52a7fb5 /databases/mysql57-server | |
parent | fb3c8f99f084a90fd4448b776d61b6c6bd482da4 (diff) | |
download | freebsd-ports-gnome-4b9f7d9de7e094ed67daa5bb425b295cdeeb0ddc.tar.gz freebsd-ports-gnome-4b9f7d9de7e094ed67daa5bb425b295cdeeb0ddc.tar.zst freebsd-ports-gnome-4b9f7d9de7e094ed67daa5bb425b295cdeeb0ddc.zip |
Revert recent change on performance_schema; introduce OPTION for it
The recent port version 5.7.10_2 introduced a change in the default
behaviour of performance_schema. Due to an ongoing debate in the
community whether the default setting should lean towards performance
(previous default before 5.7.10_2) or memory consumption, maintainer
had changed the default to memory consumption in 5.7.10_2.
This introduces an OPTION knob PERFSCHM to control the default behaviour
of performance_schema. It defaults to ON, hence restoring the previous
default.
Bump PORTREVISION.
PR: 206912
Submitted by: smh
Reviewed by: mokhi64@gmail.com (maintainer), riggs
Approved by: mokhi64@gmail.com (maintainer)
MFH: 2016Q1
Diffstat (limited to 'databases/mysql57-server')
-rw-r--r-- | databases/mysql57-server/Makefile | 11 | ||||
-rw-r--r-- | databases/mysql57-server/files/mysql-server.in | 2 | ||||
-rw-r--r-- | databases/mysql57-server/pkg-message | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index b8feeaf09877..f9af68b36c58 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= mysql PORTVERSION= 5.7.10 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost PKGNAMESUFFIX?= 57-server @@ -102,6 +102,15 @@ INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 +OPTIONS_GROUP+= FEATURES +OPTIONS_GROUP_FEATURES= PERFSCHM +FEATURES_DESC= Default features knobs +PERFSCHM_DESC= Enable "Performance Schema" by default (High RAM usage) +OPTIONS_DEFAULT+= PERFSCHM + +PERFSCHM_SUB_LIST+= PERFSCHEMRC="" +PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" + .else USES+= readline .endif diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in index f4b1204d3dac..ac539a219aa7 100644 --- a/databases/mysql57-server/files/mysql-server.in +++ b/databases/mysql57-server/files/mysql-server.in @@ -41,7 +41,7 @@ mysql_limits_args="-e -U ${mysql_user}" : ${hostname:=`/bin/hostname`} pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"} command="/usr/sbin/daemon" -command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} --skip-performance-schema" +command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --user=${mysql_user} --datadir=${mysql_dbdir} --pid-file=${pidfile} ${mysql_args} %%PERFSCHEMRC%%" procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" diff --git a/databases/mysql57-server/pkg-message b/databases/mysql57-server/pkg-message index 67f6b1cab08f..fb714ab55d91 100644 --- a/databases/mysql57-server/pkg-message +++ b/databases/mysql57-server/pkg-message @@ -3,11 +3,8 @@ Remember to run mysql_upgrade the first time you start the MySQL server after an upgrade from an earlier version. -Init. password for first time use of MySQL is saved in $HOME/.mysql_secret +Initial password for first time use of MySQL is saved in $HOME/.mysql_secret ie. when you want to use "mysql -u root -p" first you should see password in /root/.mysql_secret -performance_schema feature is set off by default, because of using high RAM. -if you need it enable it yourself :) - ***************************************************************************** |