Attachment #168568 for bug #206998

View | Details | Raw Unified | Return to bug 206998 | Differences between

and this patch

Lines 2-8 Link Here

(-)mysql57-client/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $	2	# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTREVISION?= 1	5	PORTREVISION?= 2
6	PKGNAMESUFFIX= 57-client	6	PKGNAMESUFFIX= 57-client
7		7
8	COMMENT= Multithreaded SQL database (client)	8	COMMENT= Multithreaded SQL database (client)

Lines 3-9 Link Here

(-)mysql57-server/Makefile (-1 / +25 lines)
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.11	5	PORTVERSION= 5.7.11
6	PORTREVISION?= 2	6	PORTREVISION?= 3
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
Lines 82-89 Link Here
82	mariadb[0-9][0-9]-server-* \	82	mariadb[0-9][0-9]-server-* \
83	percona[0-9][0-9]-server-*	83	percona[0-9][0-9]-server-*
84		84
		85	MY_DBDIR= /var/db/mysql
		86	MY_SECDIR= /var/db/mysql_secure
		87	MY_TMPDIR= /var/db/mysql_tmpdir
		88
85	USE_RC_SUBR= mysql-server	89	USE_RC_SUBR= mysql-server
86		90
		91	SUB_FILES= my.cnf.sample
		92	SUB_LIST= MY_DBDIR=${MY_DBDIR} \
		93	MY_SECDIR=${MY_SECDIR} \
		94	MY_TMPDIR=${MY_TMPDIR}
		95
		96	PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
		97	MY_SECDIR=${MY_SECDIR} \
		98	MY_TMPDIR=${MY_TMPDIR}
		99
87	USERS= mysql	100	USERS= mysql
88	GROUPS= mysql	101	GROUPS= mysql
89		102
Lines 145-148 Link Here
145	post-patch:	158	post-patch:
146	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt	159	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
147		160
		161	.if !defined(CLIENT_ONLY)
		162	post-install:
		163	${MKDIR} ${STAGEDIR}${ETCDIR}
		164	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
		165
		166	post-stage:
		167	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
		168	${MKDIR} ${STAGEDIR}${MY_SECDIR}
		169	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
		170	.endif
		171
148	.include <bsd.port.post.mk>	172	.include <bsd.port.post.mk>




[client]
port                            = 3306
socket                          = /tmp/mysql.sock

[mysql]
prompt                          = \u@\h [\d]>\_
no_auto_rehash

[mysqld]
user                            = mysql
port                            = 3306
socket                          = /tmp/mysql.sock
bind-address                    = 127.0.0.1
basedir                         = %%PREFIX%%
datadir                         = %%MY_DBDIR%%
tmpdir                          = %%MY_TMPDIR%%
slave-load-tmpdir               = %%MY_TMPDIR%%
secure-file-priv                = %%MY_SECDIR%%
log-bin                         = mysql-bin
log-output                      = TABLE
master-info-repository          = TABLE
relay-log-info-repository       = TABLE
relay-log-recovery              = 1
slow-query-log                  = 1
server-id                       = 1
sync_binlog                     = 1
sync_relay_log                  = 1
binlog_cache_size               = 16M
expire_logs_days                = 30
default_password_lifetime       = 0
enforce-gtid-consistency        = 1
gtid-mode                       = ON
safe-user-create                = 1
lower_case_table_names          = 1
explicit-defaults-for-timestamp = 1
myisam-recover-options          = BACKUP,FORCE
open_files_limit                = 32768
table_open_cache                = 16384
table_definition_cache          = 8196
net_retry_count                 = 16384
key_buffer_size                 = 256M
max_allowed_packet              = 64M
query_cache_type                = 0
query_cache_size                = 0
long_query_time                 = 0.5
innodb_buffer_pool_size         = 1G
innodb_data_home_dir            = %%MY_DBDIR%%
innodb_log_group_home_dir       = %%MY_DBDIR%%
innodb_data_file_path           = ibdata1:128M:autoextend
innodb_temp_data_file_path      = ibtmp1:128M:autoextend
innodb_flush_method             = O_DIRECT
innodb_log_file_size            = 256M
innodb_log_buffer_size          = 16M
innodb_write_io_threads         = 8
innodb_read_io_threads          = 8
innodb_autoinc_lock_mode        = 2
skip-symbolic-links

[mysqldump]
max_allowed_packet              = 256M
quote_names
quick




# mysql_limits (bool):	Set to "NO" by default.
#			Set it to yes to run `limits -e -U mysql`
#			just before mysql starts.
# mysql_dbdir (str):	Default to "%%MY_DBDIR%%"
#			Base database directory.
# mysql_confdir (str):	Default to "%%ETCDIR%%"
#			Base configuration directory.
# mysql_optfile (str):	Server-specific option file.
#			Default to "${mysql_confdir}/my.cnf".


: ${mysql_enable="NO"}
: ${mysql_limits="NO"}
: ${mysql_dbdir="%%MY_DBDIR%%"}
: ${mysql_confdir="%%ETCDIR%%"}
: ${mysql_optfile="${mysql_confdir}/my.cnf"}

mysql_user="mysql"

Lines 151-153 Link Here

(-)mysql57-server/pkg-plist (+4 lines)
151	%%DATADIR%%/swedish/errmsg.sys	151	%%DATADIR%%/swedish/errmsg.sys
152	%%DATADIR%%/ukrainian/errmsg.sys	152	%%DATADIR%%/ukrainian/errmsg.sys
153	%%DATADIR%%/uninstall_rewriter.sql	153	%%DATADIR%%/uninstall_rewriter.sql
		154	@sample %%ETCDIR%%/my.cnf.sample
		155	@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
		156	@dir(mysql,mysql,0750) %%MY_SECDIR%%
		157	@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Return to bug 206998

Line 0 Link Here

(-)mysql57-server/files/my.cnf.sample.in (+62 lines)
	1	[client]
	2	port = 3306
	3	socket = /tmp/mysql.sock
	4
	5	[mysql]
	6	prompt = \u@\h [\d]>\_
	7	no_auto_rehash
	8
	9	[mysqld]
	10	user = mysql
	11	port = 3306
	12	socket = /tmp/mysql.sock
	13	bind-address = 127.0.0.1
	14	basedir = %%PREFIX%%
	15	datadir = %%MY_DBDIR%%
	16	tmpdir = %%MY_TMPDIR%%
	17	slave-load-tmpdir = %%MY_TMPDIR%%
	18	secure-file-priv = %%MY_SECDIR%%
	19	log-bin = mysql-bin
	20	log-output = TABLE
	21	master-info-repository = TABLE
	22	relay-log-info-repository = TABLE
	23	relay-log-recovery = 1
	24	slow-query-log = 1
	25	server-id = 1
	26	sync_binlog = 1
	27	sync_relay_log = 1
	28	binlog_cache_size = 16M
	29	expire_logs_days = 30
	30	default_password_lifetime = 0
	31	enforce-gtid-consistency = 1
	32	gtid-mode = ON
	33	safe-user-create = 1
	34	lower_case_table_names = 1
	35	explicit-defaults-for-timestamp = 1
	36	myisam-recover-options = BACKUP,FORCE
	37	open_files_limit = 32768
	38	table_open_cache = 16384
	39	table_definition_cache = 8196
	40	net_retry_count = 16384
	41	key_buffer_size = 256M
	42	max_allowed_packet = 64M
	43	query_cache_type = 0
	44	query_cache_size = 0
	45	long_query_time = 0.5
	46	innodb_buffer_pool_size = 1G
	47	innodb_data_home_dir = %%MY_DBDIR%%
	48	innodb_log_group_home_dir = %%MY_DBDIR%%
	49	innodb_data_file_path = ibdata1:128M:autoextend
	50	innodb_temp_data_file_path = ibtmp1:128M:autoextend
	51	innodb_flush_method = O_DIRECT
	52	innodb_log_file_size = 256M
	53	innodb_log_buffer_size = 16M
	54	innodb_write_io_threads = 8
	55	innodb_read_io_threads = 8
	56	innodb_autoinc_lock_mode = 2
	57	skip-symbolic-links
	58
	59	[mysqldump]
	60	max_allowed_packet = 256M
	61	quote_names
	62	quick

Lines 14-22 Link Here

(-)mysql57-server/files/mysql-server.in (-4 / +4 lines)
14	# mysql_limits (bool): Set to "NO" by default.	14	# mysql_limits (bool): Set to "NO" by default.
15	# Set it to yes to run `limits -e -U mysql`	15	# Set it to yes to run `limits -e -U mysql`
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 "%%MY_DBDIR%%"
18	# Base database directory.	18	# Base database directory.
19	# mysql_confdir (str): Default to "${mysql_dbdir}"	19	# mysql_confdir (str): Default to "%%ETCDIR%%"
20	# Base configuration directory.	20	# Base configuration directory.
21	# mysql_optfile (str): Server-specific option file.	21	# mysql_optfile (str): Server-specific option file.
22	# Default to "${mysql_confdir}/my.cnf".	22	# Default to "${mysql_confdir}/my.cnf".
Lines 35-42 Link Here
35		35
36	: ${mysql_enable="NO"}	36	: ${mysql_enable="NO"}
37	: ${mysql_limits="NO"}	37	: ${mysql_limits="NO"}
38	: ${mysql_dbdir="/var/db/mysql"}	38	: ${mysql_dbdir="%%MY_DBDIR%%"}
39	: ${mysql_confdir="${mysql_dbdir}"}	39	: ${mysql_confdir="%%ETCDIR%%"}
40	: ${mysql_optfile="${mysql_confdir}/my.cnf"}	40	: ${mysql_optfile="${mysql_confdir}/my.cnf"}
41		41
42	mysql_user="mysql"	42	mysql_user="mysql"