Date: Thu, 8 Feb 2018 12:45:56 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r461219 - in head/databases/mysql80-server: . files Message-ID: <201802081245.w18CjuF7095536@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Thu Feb 8 12:45:56 2018 New Revision: 461219 URL: https://svnweb.freebsd.org/changeset/ports/461219 Log: databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base This is port of r461217 Modified: head/databases/mysql80-server/Makefile head/databases/mysql80-server/files/mysql-server.in Modified: head/databases/mysql80-server/Makefile ============================================================================== --- head/databases/mysql80-server/Makefile Thu Feb 8 12:45:25 2018 (r461218) +++ head/databases/mysql80-server/Makefile Thu Feb 8 12:45:56 2018 (r461219) @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 8.0.2 +PORTREVISION?= 1 DISTVERSIONSUFFIX?= -dmr CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-8.0 Modified: head/databases/mysql80-server/files/mysql-server.in ============================================================================== --- head/databases/mysql80-server/files/mysql-server.in Thu Feb 8 12:45:25 2018 (r461218) +++ head/databases/mysql80-server/files/mysql-server.in Thu Feb 8 12:45:56 2018 (r461219) @@ -47,6 +47,9 @@ fi if [ ! -z "${mysql_optfile}" ]; then mysql_extra="--defaults-extra-file=${mysql_optfile}" fi +if [ "${mysql_limits}" = "NO" ]; then +mysql_limits="" +fi mysql_user="mysql" mysql_limits_args="-e -U ${mysql_user}" @@ -70,7 +73,7 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi - if checkyesno mysql_limits; then + if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null else return 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802081245.w18CjuF7095536>