diff options
Diffstat (limited to 'databases/mariadb104-server/files/mysql-server.in')
| -rw-r--r-- | databases/mariadb104-server/files/mysql-server.in | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/databases/mariadb104-server/files/mysql-server.in b/databases/mariadb104-server/files/mysql-server.in index 4e2753f09ee6..965e81ac025c 100644 --- a/databases/mariadb104-server/files/mysql-server.in +++ b/databases/mariadb104-server/files/mysql-server.in @@ -7,9 +7,6 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_(instance_)?enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` -%%LEGACY_LIMITS%%# just before mysql starts. # mysql_(instance_)?dbdir (str): Base database directory. # Default to "/var/db/mysql" # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -34,9 +31,7 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} : ${mysql_user="%%MARIADB_USER%%"} -%%LEGACY_LIMITS%%mysql_limits_args="-e -U ${mysql_user}" : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -52,9 +47,7 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" - %%LEGACY_LIMITS%%eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" - %%LEGACY_LIMITS%%eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" eval mysql_socket="\${mysql_${instance}_socket:-\"${mysql_socket}\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" @@ -126,12 +119,7 @@ mysql_prestart() install -d -o ${mysql_user} -g $(id -gn $mysql_user) "${mysql_rundir}" fi -%%LEGACY_LIMITS%% if checkyesno mysql_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + return 0 } mysql_poststart() |