sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-28 00:46:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

databases/mysql57-server: Fix rc-script ${name}_limits conflict for post-r328331 base

Browse source 
This is port of r461217
This commit is contained in:
Mahdi Mokhtari 2018-02-08 12:45:56 +00:00
parent 733b35d35e
commit 1a952ad776
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461219
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/mysql80-server/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME?= mysql PORTNAME?= mysql
PORTVERSION= 8.0.2 PORTVERSION= 8.0.2
PORTREVISION?= 1
DISTVERSIONSUFFIX?= -dmr DISTVERSIONSUFFIX?= -dmr
CATEGORIES= databases ipv6 CATEGORIES= databases ipv6
MASTER_SITES= MYSQL/MySQL-8.0 MASTER_SITES= MYSQL/MySQL-8.0

5
databases/mysql80-server/files/mysql-server.in
View file

@ -47,6 +47,9 @@ fi
if [ ! -z "${mysql_optfile}" ]; then if [ ! -z "${mysql_optfile}" ]; then
mysql_extra="--defaults-extra-file=${mysql_optfile}" mysql_extra="--defaults-extra-file=${mysql_optfile}"
fi fi
if [ "${mysql_limits}" = "NO" ]; then
mysql_limits=""
fi
mysql_user="mysql" mysql_user="mysql"
mysql_limits_args="-e -U ${mysql_user}" mysql_limits_args="-e -U ${mysql_user}"
@ -70,7 +73,7 @@ mysql_prestart()
if [ ! -d "${mysql_dbdir}/mysql/." ]; then if [ ! -d "${mysql_dbdir}/mysql/." ]; then
mysql_create_auth_tables || return 1 mysql_create_auth_tables || return 1
fi fi
if checkyesno mysql_limits; then if [ -z "$mysql_limits" ] || checkyesno mysql_limits; then
eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null
else else
return 0 return 0