diff options
| author | mmokhi <mmokhi@FreeBSD.org> | 2018-02-08 20:45:56 +0800 |
|---|---|---|
| committer | mmokhi <mmokhi@FreeBSD.org> | 2018-02-08 20:45:56 +0800 |
| commit | d7359063b008a7cb75d4a85600f612728a01ed03 (patch) | |
| tree | 9520cda4bd3efe0f9c0472a59aeddb0c3a1ff051 /databases | |
| parent | 9c8eea591490da8cf9daf1f534465193c83d087f (diff) | |
| download | freebsd-ports-gnome-d7359063b008a7cb75d4a85600f612728a01ed03.tar.gz freebsd-ports-gnome-d7359063b008a7cb75d4a85600f612728a01ed03.tar.zst freebsd-ports-gnome-d7359063b008a7cb75d4a85600f612728a01ed03.zip | |
databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base
This is port of r461217
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql80-server/Makefile | 1 | ||||
| -rw-r--r-- | databases/mysql80-server/files/mysql-server.in | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/databases/mysql80-server/Makefile b/databases/mysql80-server/Makefile index 980830c48e6a..78d3c80a93c1 100644 --- a/databases/mysql80-server/Makefile +++ b/databases/mysql80-server/Makefile @@ -3,6 +3,7 @@ PORTNAME?= mysql PORTVERSION= 8.0.2 +PORTREVISION?= 1 DISTVERSIONSUFFIX?= -dmr CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-8.0 diff --git a/databases/mysql80-server/files/mysql-server.in b/databases/mysql80-server/files/mysql-server.in index 7b86d4e2e047..9f3305aae79e 100644 --- a/databases/mysql80-server/files/mysql-server.in +++ b/databases/mysql80-server/files/mysql-server.in @@ -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 |