View | Details | Raw Unified | Return to bug 206998 | Differences between
and this patch

Collapse All | Expand All

(-)mysql57-server/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mysql
4
PORTNAME=	mysql
5
PORTVERSION=	5.7.11
5
PORTVERSION=	5.7.11
6
PORTREVISION?=	1
6
PORTREVISION?=	2
7
CATEGORIES=	databases ipv6
7
CATEGORIES=	databases ipv6
8
MASTER_SITES=	MYSQL/MySQL-5.7
8
MASTER_SITES=	MYSQL/MySQL-5.7
9
PKGNAMESUFFIX?=	57-server
9
PKGNAMESUFFIX?=	57-server
(-)mysql57-server/files/mysql-server.in (-6 / +8 lines)
Lines 16-23 Link Here
16
#			just before mysql starts.
16
#			just before mysql starts.
17
# mysql_dbdir (str):	Default to "/var/db/mysql"
17
# mysql_dbdir (str):	Default to "/var/db/mysql"
18
#			Base database directory.
18
#			Base database directory.
19
# mysql_confdir (str):	Default to "${mysql_dbdir}"
20
#			Base configuration directory.
19
# mysql_optfile (str):	Server-specific option file.
21
# mysql_optfile (str):	Server-specific option file.
20
#			Default to "${mysql_dbdir}/my.cnf".
22
#			Default to "${mysql_confdir}/my.cnf".
21
# mysql_pidfile (str):	Custum PID file path and name.
23
# mysql_pidfile (str):	Custum PID file path and name.
22
#			Default to "${mysql_dbdir}/${hostname}.pid".
24
#			Default to "${mysql_dbdir}/${hostname}.pid".
23
# mysql_args (str):	Custom additional arguments to be passed
25
# mysql_args (str):	Custom additional arguments to be passed
Lines 34-62 Link Here
34
: ${mysql_enable="NO"}
36
: ${mysql_enable="NO"}
35
: ${mysql_limits="NO"}
37
: ${mysql_limits="NO"}
36
: ${mysql_dbdir="/var/db/mysql"}
38
: ${mysql_dbdir="/var/db/mysql"}
37
: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
39
: ${mysql_confdir="${mysql_dbdir}"}
40
: ${mysql_optfile="${mysql_confdir}/my.cnf"}
38
41
39
mysql_user="mysql"
42
mysql_user="mysql"
40
mysql_limits_args="-e -U ${mysql_user}"
43
mysql_limits_args="-e -U ${mysql_user}"
41
: ${hostname:=`/bin/hostname`}
44
: ${hostname:=`/bin/hostname`}
42
pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
45
pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
43
command="/usr/sbin/daemon"
46
command="/usr/sbin/daemon"
44
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%%"
47
command_args="-c -f %%PREFIX%%/bin/mysqld_safe --defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --pid-file=${pidfile} --user=${mysql_user} ${mysql_args} %%PERFSCHEMRC%%"
45
procname="%%PREFIX%%/libexec/mysqld"
48
procname="%%PREFIX%%/libexec/mysqld"
46
start_precmd="${name}_prestart"
49
start_precmd="${name}_prestart"
47
start_postcmd="${name}_poststart"
50
start_postcmd="${name}_poststart"
48
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
51
mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
49
mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
52
mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
50
53
51
mysql_create_auth_tables()
54
mysql_create_auth_tables()
52
{
55
{
53
	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
56
	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
54
        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
55
}
57
}
56
58
57
mysql_prestart()
59
mysql_prestart()
58
{
60
{
59
	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
61
	if [ ! -d "${mysql_dbdir}/mysql" ]; then
60
		mysql_create_auth_tables || return 1
62
		mysql_create_auth_tables || return 1
61
	fi
63
	fi
62
	if checkyesno mysql_limits; then
64
	if checkyesno mysql_limits; then

Return to bug 206998