Attachment #169320 for bug #206998

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

and this patch




# $FreeBSD: head/databases/mysql57-client/Makefile 408878 2016-02-14 18:28:34Z smh $

PORTNAME=	mysql
PORTREVISION?=	4
PKGNAMESUFFIX=	57-client

COMMENT=	Multithreaded SQL database (client)

PATCHDIR=	${.CURDIR}/files
PLIST=		${.CURDIR}/pkg-plist

CONFLICTS_INSTALL=	mysql5[0-68-9]-client-* \
			mysql[0-46-9][0-9]-client-* \
			mariadb[0-9][0-9]-client-* \
			percona[0-9][0-9]-client-*

CMAKE_ARGS+=	-DWITHOUT_SERVER=1
		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
		-DWITHOUT_SERVER=1 \
		-DWITH_SYSTEMD=0

USE_LDCONFIG+=	${PREFIX}/lib/mysql





--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ CMakeLists.txt
@@ -606,8 +606,8 @@ ENDIF()
 
 ADD_SUBDIRECTORY(extra)
 ADD_SUBDIRECTORY(client)

 
 IF(UNIX)
   ADD_SUBDIRECTORY(man)
@@ -676,14 +676,13 @@ ELSE()
   SET(CPACK_GENERATOR "TGZ")
 ENDIF() 
 ADD_SUBDIRECTORY(packaging/WiX)

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ client/CMakeLists.txt
@@ -47,6 +47,7 @@ IF(UNIX)
   TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
 ENDIF(UNIX)
 

 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
     upgrade/program.cc
@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
 TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
 ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
 ENDIF()

 
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
 

 
 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
 

 
 IF(UNIX AND NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_install_db
@@ -122,7 +130,6 @@ IF(WIN32)
 ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-cmake_build__configurations_compiler__options.cmake (-1 / +1 lines)
1	--- cmake/build_configurations/compiler_options.cmake.orig 2015-11-29 19:16:24 UTC	1	--- cmake/build_configurations/compiler_options.cmake.orig 2016-03-28 18:06:12 UTC
2	+++ cmake/build_configurations/compiler_options.cmake	2	+++ cmake/build_configurations/compiler_options.cmake
3	@@ -28,7 +28,7 @@ IF(UNIX)	3	@@ -28,7 +28,7 @@ IF(UNIX)
4		4

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-cmake_os_DragonFly.cmake (-1 / +1 lines)
1	--- cmake/os/DragonFly.cmake.orig 2015-12-17 10:53:10 UTC	1	--- cmake/os/DragonFly.cmake.orig 2016-04-14 10:16:17 UTC
2	+++ cmake/os/DragonFly.cmake	2	+++ cmake/os/DragonFly.cmake
3	@@ -0,0 +1,24 @@	3	@@ -0,0 +1,24 @@
4	+INCLUDE(CheckCSourceRuns)	4	+INCLUDE(CheckCSourceRuns)

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-cmd-line-utils_libedit_chartype.h (-1 / +1 lines)
1	--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/chartype.h	2	+++ cmd-line-utils/libedit/chartype.h
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-cmd-line-utils_libedit_vi.c (-1 / +1 lines)
1	--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/vi.c	2	+++ cmd-line-utils/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att	3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however	4	* NB: posix implies that we should enter insert mode, however

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-extra_CMakeLists.txt (-1 / +1 lines)
1	--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- extra/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ extra/CMakeLists.txt	2	+++ extra/CMakeLists.txt
3	@@ -45,6 +45,7 @@ ENDIF()	3	@@ -45,6 +45,7 @@ ENDIF()
4		4

Lines 1-6 Link Here

(-)mysql57-client.01/files/patch-include_CMakeLists.txt (-3 / +2 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -37,6 +37,7 @@ SET(HEADERS_ABI	3	@@ -38,6 +38,7 @@ SET(HEADERS_ABI
4		4
5	SET(HEADERS	5	SET(HEADERS
6	${HEADERS_ABI}	6	${HEADERS_ABI}
Lines 8-11 Link Here
8	my_dbug.h	8	my_dbug.h
9	m_string.h	9	m_string.h
10	my_sys.h	10	my_sys.h
11

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-include_my__compare.h (-1 / +1 lines)
1	--- include/my_compare.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
2	+++ include/my_compare.h	2	+++ include/my_compare.h
3	@@ -40,7 +40,7 @@ extern "C" {	3	@@ -40,7 +40,7 @@ extern "C" {
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-include_myisam.h (-1 / +1 lines)
1	--- include/myisam.h.orig 2015-11-29 19:16:24 UTC	1	--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
2	+++ include/myisam.h	2	+++ include/myisam.h
3	@@ -45,7 +45,7 @@ extern "C" {	3	@@ -45,7 +45,7 @@ extern "C" {
4	The following defines can be increased if necessary.	4	The following defines can be increased if necessary.

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-libmysql_CMakeLists.txt (-1 / +1 lines)
1	--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)	3	@@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
4	COMPONENT SharedLibraries)	4	COMPONENT SharedLibraries)

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-mysys__ssl_my__default.cc (-1 / +1 lines)
1	--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC	1	--- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;	3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
4		4

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-scripts_CMakeLists.txt (-1 / +1 lines)
1	--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -43,6 +43,7 @@ ELSE()	3	@@ -43,6 +43,7 @@ ELSE()
4	MESSAGE(FATAL_ERROR "Cannot concatenate files")	4	MESSAGE(FATAL_ERROR "Cannot concatenate files")

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-storage_myisam_mi__dynrec.c (-1 / +1 lines)
1	--- storage/myisam/mi_dynrec.c.orig 2015-12-14 07:39:39 UTC	1	--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
2	+++ storage/myisam/mi_dynrec.c	2	+++ storage/myisam/mi_dynrec.c
3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my	3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);




--- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ support-files/CMakeLists.txt
@@ -44,14 +44,17 @@ ELSE()
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})

   FOREACH(script  mysqld_multi.server mysql-log-rotate)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -68,9 +71,11 @@ IF(UNIX)
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
   ENDIF()
+ENDIF()
 
   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+IF(FALSE)
   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   
+IF(FALSE)
   SET(bindir ${prefix}/${INSTALL_BINDIR})
   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
   SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
@@ -83,3 +88,4 @@ IF(UNIX)
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 ENDIF()




# $FreeBSD: head/databases/mysql57-server/Makefile 412695 2016-04-07 22:23:19Z dim $

PORTNAME=	mysql
PORTVERSION=	5.7.12
PORTREVISION?=	5
CATEGORIES=	databases ipv6
MASTER_SITES=	MYSQL/MySQL-5.7
PKGNAMESUFFIX?=	57-server
DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

MAINTAINER=	mokhi64@gmail.com
COMMENT=	Multithreaded SQL database (server)

LICENSE=	GPLv2

SLAVEDIRS=	databases/mysql57-client
USES=		bison:build cmake:outsource compiler:c++11-lib cpe libedit perl5 shebangfix

USE_OPENSSL=	yes
USE_PERL5=	run
OPTIONS_RADIO_ZLIB=	BUNDLED_ZLIB SYSTEM_ZLIB
OPTIONS_DEFAULT+=	OPENSSL SYSTEM_ZLIB
NO_OPTIONS_SORT=	yes

BUNDLED_SSL_DESC=	SSL/TLS support via (bundled) CyaSSL
WITHOUT_SSL_DESC=	No SSL/TLS support
BUNDLED_ZLIB_DESC=	Use bundled ZLib
SYSTEM_ZLIB_DESC=	Use system ZLib

MY_DBDIR=	/var/db/mysql
MY_SECDIR=	/var/db/mysql_secure
MY_TMPDIR=	/var/db/mysql_tmpdir

LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
		liblz4.so:${PORTSDIR}/archivers/liblz4

CMAKE_BUILD_TYPE=	Release

CMAKE_ARGS+=	-DINSTALL_LAYOUT=FREEBSD \
		-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
		-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		-DINSTALL_DOCDIR="share/doc/mysql" \
		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
		-DINSTALL_INCLUDEDIR="include/mysql" \
		-DINSTALL_INFODIR="info" \
		-DINSTALL_LIBDIR="lib/mysql" \
		-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
		-DINSTALL_MANDIR="man" \
		-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
		-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
		-DINSTALL_MYSQLSHAREDIR="share/mysql" \
		-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
		-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
		-DINSTALL_SBINDIR="libexec" \
		-DINSTALL_SCRIPTDIR="bin" \
		-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
		-DINSTALL_SHAREDIR="share" \
		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
		-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
		-DSYSCONFDIR="${ETCDIR}" \
		-DWITH_BOOST="${WRKSRC}/boost" \
		-DWITH_EDITLINE=system \
		-DWITH_LIBEVENT=system \
		-DWITH_LZ4=system \
		-DWITH_ZLIB=system \
		-DWITH_PIC=1

SHEBANG_FILES=	scripts/*.pl* scripts/*.sh


.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif

SUB_LIST=	MY_DBDIR=${MY_DBDIR} \
		MY_SECDIR=${MY_SECDIR} \
		MY_TMPDIR=${MY_TMPDIR}

PLIST_SUB=	MY_DBDIR=${MY_DBDIR} \
		MY_SECDIR=${MY_SECDIR} \
		MY_TMPDIR=${MY_TMPDIR}

# MySQL-Server part
.if !defined(CLIENT_ONLY)
USE_MYSQL=	yes
WANT_MYSQL_VER=	57

CONFLICTS_INSTALL=	mysql5[0-68-9]-server-* \
			mysql[0-46-9][0-9]-server-* \
			mariadb[0-9][0-9]-server-* \
			percona[0-9][0-9]-server-*
			mysql[0-46-9][0-689]-server-* \
			percona[0-9]*-server-*

USE_RC_SUBR=	mysql-server

SUB_FILES=	my.cnf.sample

USERS=		mysql
GROUPS=		mysql



PERFSCHM_SUB_LIST+=	PERFSCHEMRC=""
PERFSCHM_SUB_LIST_OFF+=	PERFSCHEMRC="--skip-performance-schema"

.else
USES+=			libedit
LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2

CMAKE_ARGS+=		-DWITH_EDITLINE=system \
			-DWITH_LIBEVENT=system
.endif

.include <bsd.port.pre.mk>

.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
CC=		clang
CXX=		clang++
CPP=		clang-cpp
CMAKE_ARGS+=	-DWITH_SSL=yes
.elif ${OSVERSION} >= 1000000
CMAKE_ARGS+=	-DWITH_SSL=${OPENSSLBASE}
.endif

post-extract:
	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h

post-patch:
	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt

.if !defined(CLIENT_ONLY)
post-install:
	${MKDIR} ${STAGEDIR}${ETCDIR}
	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample

post-stage:
	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
	${MKDIR} ${STAGEDIR}${MY_SECDIR}
	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
.endif

.include <bsd.port.post.mk>

Lines 1-4 Link Here

(-)mysql57-server/distinfo (-4 / +2 lines)
1	SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74	1	SHA256 (mysql-boost-5.7.12.tar.gz) = 3990c78b4064e4e972e763d62449cb8f930717b3dd2ddcbbaeeaa0f644d5333d
2	SIZE (mysql-5.7.10.tar.gz) = 48919371	2	SIZE (mysql-boost-5.7.12.tar.gz) = 60604385
3	SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
4	SIZE (boost_1_59_0.tar.gz) = 83709983




[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          = 8192
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

Lines 14-23 Link Here

(-)mysql57-server/files/mysql-server.in (-7 / +22 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 "%%ETCDIR%%"
		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 33-62 Link Here
33		35
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="%%MY_DBDIR%%"}
		39	: ${mysql_confdir="%%ETCDIR%%"}
		40	if [ -f "${mysql_dbdir}/my.cnf" ]; then
37	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}	41	: ${mysql_optfile="${mysql_dbdir}/my.cnf"}
		42	else
		43	: ${mysql_optfile="${mysql_confdir}/my.cnf"}
		44	fi
38		45
39	mysql_user="mysql"	46	mysql_user="mysql"
40	mysql_limits_args="-e -U ${mysql_user}"	47	mysql_limits_args="-e -U ${mysql_user}"
41	: ${hostname:=`/bin/hostname`}	48	: ${hostname:=`/bin/hostname`}
42	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}	49	pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
43	command="/usr/sbin/daemon"	50	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%%"	51	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"	52	procname="%%PREFIX%%/libexec/mysqld"
46	start_precmd="${name}_prestart"	53	start_precmd="${name}_prestart"
47	start_postcmd="${name}_poststart"	54	start_postcmd="${name}_poststart"
48	mysql_install_db="%%PREFIX%%/bin/mysql_install_db"	55	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}"	56	mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
50		57
51	mysql_create_auth_tables()	58	mysql_create_auth_tables()
52	{	59	{
53	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null	60	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	}	61	}
56		62
57	mysql_prestart()	63	mysql_prestart()
58	{	64	{
59	if [ ! -d "${mysql_dbdir}/mysql/." ]; then	65	if [ -f "${mysql_dbdir}/my.cnf" ]; then
		66	echo ""
		67	echo "Please keep in mind that the default location for my.cnf will be changed"
		68	echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near"
		69	echo "future. If you do not want to move your my.cnf to the new location then"
		70	echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
		71	echo ""
		72	fi
		73
		74	if [ ! -d "${mysql_dbdir}/mysql" ]; then
60	mysql_create_auth_tables \|\| return 1	75	mysql_create_auth_tables \|\| return 1
61	fi	76	fi
62	if checkyesno mysql_limits; then	77	if checkyesno mysql_limits; then




--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ CMakeLists.txt
@@ -614,12 +614,10 @@ IF(UNIX)
 ENDIF()
 
 IF(NOT WITHOUT_SERVER)

   ENDIF(WITH_EMBEDDED_SERVER)
 ENDIF()
 
@@ -628,8 +626,6 @@ ENDIF()
 ADD_SUBDIRECTORY(scripts)
 
 IF(NOT WITHOUT_SERVER)

   ADD_SUBDIRECTORY(support-files)
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
@@ -684,6 +680,7 @@ ENDIF()
 #
 # RPM installs documentation directly from the source tree
 #

 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   INSTALL(FILES COPYING LICENSE.mysql 
   DESTINATION ${INSTALL_DOCREADMEDIR} 
@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
     PATTERN "sp-imp-spec.txt" EXCLUDE
   )
 ENDIF()




--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ client/CMakeLists.txt
@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
 
 ## Subdirectory with common client code.
 ADD_SUBDIRECTORY(base)

 
 ## We will need libeay32.dll and ssleay32.dll when running client executables.
 COPY_OPENSSL_DLLS(copy_openssl_client)
@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
 
 ADD_DEFINITIONS(${SSL_DEFINES})
+IF(FALSE)

 
 IF(NOT WITHOUT_SERVER)
   MYSQL_ADD_EXECUTABLE(mysql_upgrade
@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
 ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
 

 MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
 TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
 
@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
 
 MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)

 MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
 ADD_COMPILE_FLAGS(
   mysqlbinlog.cc
@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
 
 MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
 TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)

 
 MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
 TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
   ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
 ENDIF()
 

 
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
@@ -123,11 +129,6 @@ ENDIF(WIN32)
 
 SET_TARGET_PROPERTIES (
   mysql_plugin

Lines 1-6 Link Here

(-)mysql57-server/files/patch-cmake_plugin.cmake (-2 / +2 lines)
1	--- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC	1	--- cmake/plugin.cmake.orig 2016-03-28 18:06:12 UTC
2	+++ cmake/plugin.cmake	2	+++ cmake/plugin.cmake
3	@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)	3	@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN)
4	MYSQL_INSTALL_TARGETS(${target}	4	MYSQL_INSTALL_TARGETS(${target}
5	DESTINATION ${INSTALL_PLUGINDIR}	5	DESTINATION ${INSTALL_PLUGINDIR}
6	COMPONENT ${INSTALL_COMPONENT})	6	COMPONENT ${INSTALL_COMPONENT})

Lines 1-4 Link Here

(-)mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h (-1 / +1 lines)
1	--- cmd-line-utils/libedit/chartype.h.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/chartype.h.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/chartype.h	2	+++ cmd-line-utils/libedit/chartype.h
3	@@ -49,7 +49,7 @@	3	@@ -49,7 +49,7 @@
4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */	4	TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */

Lines 1-4 Link Here

(-)mysql57-server/files/patch-cmd-line-utils_libedit_vi.c (-1 / +1 lines)
1	--- cmd-line-utils/libedit/vi.c.orig 2015-11-29 19:16:24 UTC	1	--- cmd-line-utils/libedit/vi.c.orig 2016-03-28 18:06:12 UTC
2	+++ cmd-line-utils/libedit/vi.c	2	+++ cmd-line-utils/libedit/vi.c
3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att	3	@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
4	* NB: posix implies that we should enter insert mode, however	4	* NB: posix implies that we should enter insert mode, however




--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ include/CMakeLists.txt
@@ -69,14 +69,13 @@ SET(HEADERS 
   ${HEADERS_GEN_CONFIGURE}
 )
 
+IF(FALSE)
 INSTALL(FILES
   ../libbinlogevents/export/binary_log_types.h
   DESTINATION ${INSTALL_INCLUDEDIR}
-  COMPONENT Development)
-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
  PATTERN "*.h"
  PATTERN "psi_abi*" EXCLUDE
 )

Lines 1-4 Link Here

(-)mysql57-server/files/patch-include_my__compare.h (-1 / +1 lines)
1	--- include/my_compare.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_compare.h.orig 2016-03-28 18:06:12 UTC
2	+++ include/my_compare.h	2	+++ include/my_compare.h
3	@@ -40,7 +40,7 @@ extern "C" {	3	@@ -40,7 +40,7 @@ extern "C" {
4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.	4	But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.

Lines 1-4 Link Here

(-)mysql57-server/files/patch-include_my__thread__os__id.h (-1 / +1 lines)
1	--- include/my_thread_os_id.h.orig 2015-11-29 19:16:24 UTC	1	--- include/my_thread_os_id.h.orig 2016-03-28 18:06:12 UTC
2	+++ include/my_thread_os_id.h	2	+++ include/my_thread_os_id.h
3	@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa	3	@@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
4	return pthread_getthreadid_np();	4	return pthread_getthreadid_np();

Lines 1-4 Link Here

(-)mysql57-server/files/patch-include_myisam.h (-1 / +1 lines)
1	--- include/myisam.h.orig 2015-11-29 19:16:24 UTC	1	--- include/myisam.h.orig 2016-03-28 18:06:12 UTC
2	+++ include/myisam.h	2	+++ include/myisam.h
3	@@ -45,7 +45,7 @@ extern "C" {	3	@@ -45,7 +45,7 @@ extern "C" {
4	The following defines can be increased if necessary.	4	The following defines can be increased if necessary.

Lines 1-4 Link Here

(-)mysql57-server/files/patch-libmysql_CMakeLists.txt (-1 / +1 lines)
1	--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libmysql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ libmysql/CMakeLists.txt	2	+++ libmysql/CMakeLists.txt
3	@@ -215,7 +215,7 @@ IF(WIN32)	3	@@ -215,7 +215,7 @@ IF(WIN32)
4	ENDIF()	4	ENDIF()

Lines 1-7 Link Here

(-)mysql57-server/files/patch-libservices_CMakeLists.txt (-3 / +3 lines)
1	--- libservices/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- libservices/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ libservices/CMakeLists.txt	2	+++ libservices/CMakeLists.txt
3	@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES	3	@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
4	security_context_service.c)	4	mysql_keyring_service.c)
5		5
6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
7	+IF(FALSE)	7	+IF(FALSE)

Lines 1-4 Link Here

(-)mysql57-server/files/patch-mysys__ssl_my__default.cc (-1 / +1 lines)
1	--- mysys_ssl/my_default.cc.orig 2015-11-29 19:16:24 UTC	1	--- mysys_ssl/my_default.cc.orig 2016-03-28 18:06:12 UTC
2	+++ mysys_ssl/my_default.cc	2	+++ mysys_ssl/my_default.cc
3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;	3	@@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
4		4

Lines 1-4 Link Here

(-)mysql57-server/files/patch-plugin_password__validation_validate__password.cc (-1 / +1 lines)
1	--- plugin/password_validation/validate_password.cc.orig 2015-11-29 19:16:24 UTC	1	--- plugin/password_validation/validate_password.cc.orig 2016-03-28 18:06:12 UTC
2	+++ plugin/password_validation/validate_password.cc	2	+++ plugin/password_validation/validate_password.cc
3	@@ -18,6 +18,8 @@	3	@@ -18,6 +18,8 @@
4	#include <mysql/plugin_validate_password.h>	4	#include <mysql/plugin_validate_password.h>




--- rapid/plugin/x/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ rapid/plugin/x/CMakeLists.txt
@@ -91,14 +91,14 @@ ELSE()
     ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
     ${CMAKE_SOURCE_DIR}/include #temporary
     ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
-    ${SSL_INCLUDE_DIRS}
-    ${ZLIB_INCLUDE_DIR}
+    ${BOOST_INCLUDE_DIR}
   )
 
   INCLUDE_DIRECTORIES(SYSTEM
-    ${BOOST_INCLUDE_DIR}
     ${PROTOBUF_INCLUDE_DIRS}
     ${LIBEVENT_INCLUDE_DIR}
+    ${SSL_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIR}
   )
 
   IF(XPLUGIN_NO_LITE_PROTOBUF)




--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
+++ rapid/unittest/gunit/xplugin/CMakeLists.txt
@@ -65,7 +65,6 @@ ENDIF()
 ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
 
 INCLUDE_DIRECTORIES(SYSTEM
-    ${BOOST_INCLUDE_DIR}
     ${PROTOBUF_INCLUDE_DIRS}
     ${SSL_INCLUDE_DIRS}
     ${LIBEVENT_INCLUDE_DIR}
@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
 )
 
 INCLUDE_DIRECTORIES(
+  ${BOOST_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/testing/include
   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
   ${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs

Lines 1-4 Link Here

(-)mysql57-server/files/patch-scripts_CMakeLists.txt (-1 / +1 lines)
1	--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ scripts/CMakeLists.txt	2	+++ scripts/CMakeLists.txt
3	@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)	3	@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)	4	GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)

Lines 1-4 Link Here

(-)mysql57-server/files/patch-sql_CMakeLists.txt (-1 / +1 lines)
1	--- sql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- sql/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ sql/CMakeLists.txt	2	+++ sql/CMakeLists.txt
3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(	3	@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
4	${ZLIB_INCLUDE_DIR}	4	${ZLIB_INCLUDE_DIR}

Lines 1-4 Link Here

(-)mysql57-server/files/patch-sql_conn__handler_socket__connection.cc (-1 / +1 lines)
1	--- sql/conn_handler/socket_connection.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/conn_handler/socket_connection.cc.orig 2016-03-28 18:06:12 UTC
2	+++ sql/conn_handler/socket_connection.cc	2	+++ sql/conn_handler/socket_connection.cc
3	@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li	3	@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
4	signal(SIGCHLD, SIG_DFL);	4	signal(SIGCHLD, SIG_DFL);

Lines 1-4 Link Here

(-)mysql57-server/files/patch-sql_json__dom.h (-1 / +1 lines)
1	--- sql/json_dom.h.orig 2015-11-29 19:16:24 UTC	1	--- sql/json_dom.h.orig 2016-03-28 18:06:12 UTC
2	+++ sql/json_dom.h	2	+++ sql/json_dom.h
3	@@ -368,7 +368,7 @@ struct Json_key_comparator	3	@@ -368,7 +368,7 @@ struct Json_key_comparator
4	Json_object class.	4	Json_object class.

Lines 1-6 Link Here

(-)mysql57-server/files/patch-sql_sql__view.cc (-2 / +2 lines)
1	--- sql/sql_view.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/sql_view.cc.orig 2016-03-28 18:06:12 UTC
2	+++ sql/sql_view.cc	2	+++ sql/sql_view.cc
3	@@ -768,46 +768,46 @@ static const int required_view_parameter	3	@@ -773,46 +773,46 @@ static const int required_view_parameter
4	*/	4	*/
5	static File_option view_parameters[]=	5	static File_option view_parameters[]=
6	{{{ C_STRING_WITH_LEN("query")},	6	{{{ C_STRING_WITH_LEN("query")},




--- sql/sys_vars.cc.orig	2016-03-28 18:06:12 UTC
+++ sql/sys_vars.cc
@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
        "connection before closing it",

 
 static Sys_var_ulong Sys_join_buffer_size(
        "join_buffer_size",
@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
        "Number of seconds to wait for more data from a connection before "
        "aborting the read",
        SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),

        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_read_timeout));
 
@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
        "Number of seconds to wait for a block to be written to a connection "
        "before aborting the write",
        SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),

        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_net_write_timeout));
 
@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
        "The number of seconds the server waits for activity on a "
        "connection before closing it",
        SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),

Lines 1-6 Link Here

(-)mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc (-2 / +2 lines)
1	--- storage/innobase/buf/buf0buf.cc.orig 2015-11-29 19:16:24 UTC	1	--- storage/innobase/buf/buf0buf.cc.orig 2016-03-28 18:06:12 UTC
2	+++ storage/innobase/buf/buf0buf.cc	2	+++ storage/innobase/buf/buf0buf.cc
3	@@ -300,7 +300,7 @@ typedef std::map<	3	@@ -338,7 +338,7 @@ typedef std::map<
4	const byte*,	4	const byte*,
5	buf_chunk_t*,	5	buf_chunk_t*,
6	std::less<const byte*>,	6	std::less<const byte*>,

Lines 1-4 Link Here

(-)mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc (-1 / +1 lines)
1	--- storage/innobase/dict/dict0stats.cc.orig 2015-11-29 19:16:24 UTC	1	--- storage/innobase/dict/dict0stats.cc.orig 2016-03-28 18:06:12 UTC
2	+++ storage/innobase/dict/dict0stats.cc	2	+++ storage/innobase/dict/dict0stats.cc
3	@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the	3	@@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the
4	typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t;	4	typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> > boundaries_t;

Lines 1-4 Link Here

(-)mysql57-server/files/patch-storage_innobase_include_srv0mon.h (-1 / +1 lines)
1	--- storage/innobase/include/srv0mon.h.orig 2015-11-29 19:16:24 UTC	1	--- storage/innobase/include/srv0mon.h.orig 2016-03-28 18:06:12 UTC
2	+++ storage/innobase/include/srv0mon.h	2	+++ storage/innobase/include/srv0mon.h
3	@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang	3	@@ -34,6 +34,10 @@ Created 12/15/2009 Jimmy Yang
4	/* Required for FreeBSD so that INT64_MAX is defined. */	4	/* Required for FreeBSD so that INT64_MAX is defined. */

Lines 1-6 Link Here

(-)mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc (-2 / +2 lines)
1	--- storage/innobase/sync/sync0debug.cc.orig 2015-11-29 19:16:24 UTC	1	--- storage/innobase/sync/sync0debug.cc.orig 2016-03-28 18:06:12 UTC
2	+++ storage/innobase/sync/sync0debug.cc	2	+++ storage/innobase/sync/sync0debug.cc
3	@@ -1704,7 +1704,7 @@ private:	3	@@ -1702,7 +1702,7 @@ private:
4	const void*,	4	const void*,
5	File,	5	File,
6	std::less<const void*>,	6	std::less<const void*>,

Lines 1-4 Link Here

(-)mysql57-server/files/patch-storage_myisam_mi__dynrec.c (-1 / +1 lines)
1	--- storage/myisam/mi_dynrec.c.orig 2015-11-29 19:16:24 UTC	1	--- storage/myisam/mi_dynrec.c.orig 2016-03-28 18:06:12 UTC
2	+++ storage/myisam/mi_dynrec.c	2	+++ storage/myisam/mi_dynrec.c
3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my	3	@@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
4	DBUG_RETURN(1);	4	DBUG_RETURN(1);

Lines 1-4 Link Here

(-)mysql57-server/files/patch-support-files_CMakeLists.txt (-2 / +2 lines)
1	--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -69,7 +69,9 @@ IF(UNIX)	3	@@ -69,7 +69,9 @@ IF(UNIX)
4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	4	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
Lines 7-12 Link Here
7	+IF(FALSE)	7	+IF(FALSE)
8	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)	8	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
9	+ENDIF()	9	+ENDIF()
10	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
11		10
12	SET(bindir ${prefix}/${INSTALL_BINDIR})	11	SET(bindir ${prefix}/${INSTALL_BINDIR})
		12	SET(sbindir ${prefix}/${INSTALL_SBINDIR})

Lines 8-10 Link Here

(-)mysql57-server/pkg-message (+10 lines)
8	in /root/.mysql_secret	8	in /root/.mysql_secret
9		9
10	*****************************************************************************	10	*****************************************************************************
		11
		12	*****************************************************************************
		13
		14	Please keep in mind that the default location for my.cnf will be changed
		15	from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
		16	future. If you do not want to move your my.cnf to the new location then
		17	you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
		18
		19	*****************************************************************************
		20

Lines 25-30 Link Here

(-)mysql57-server/pkg-plist (+5 lines)
25	lib/mysql/plugin/auth_test_plugin.so	25	lib/mysql/plugin/auth_test_plugin.so
26	lib/mysql/plugin/daemon_example.ini	26	lib/mysql/plugin/daemon_example.ini
27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so	27	%%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
		28	lib/mysql/plugin/keyring_file.so
28	lib/mysql/plugin/libdaemon_example.so	29	lib/mysql/plugin/libdaemon_example.so
29	lib/mysql/plugin/libtest_framework.so	30	lib/mysql/plugin/libtest_framework.so
30	lib/mysql/plugin/libtest_services.so	31	lib/mysql/plugin/libtest_services.so
Lines 150-152 Link Here
150	%%DATADIR%%/swedish/errmsg.sys	151	%%DATADIR%%/swedish/errmsg.sys
151	%%DATADIR%%/ukrainian/errmsg.sys	152	%%DATADIR%%/ukrainian/errmsg.sys
152	%%DATADIR%%/uninstall_rewriter.sql	153	%%DATADIR%%/uninstall_rewriter.sql
		154	@sample(root,wheel,0640) %%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

Lines 2-8 Link Here

(-)mysql57-client.01/Makefile (-6 / +5 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?= 4
6	PKGNAMESUFFIX= 57-client	5	PKGNAMESUFFIX= 57-client
7		6
8	COMMENT= Multithreaded SQL database (client)	7	COMMENT= Multithreaded SQL database (client)
Lines 15-26 Link Here
15	PATCHDIR= ${.CURDIR}/files	14	PATCHDIR= ${.CURDIR}/files
16	PLIST= ${.CURDIR}/pkg-plist	15	PLIST= ${.CURDIR}/pkg-plist
17		16
18	CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*	17	CONFLICTS_INSTALL= mysql5[0-68-9]-client-* \
		18	mysql[0-46-9][0-9]-client-* \
		19	mariadb[0-9][0-9]-client-* \
		20	percona[0-9][0-9]-client-*
19		21
20	CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \	22	CMAKE_ARGS+= -DWITHOUT_SERVER=1
21	-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
22	-DWITHOUT_SERVER=1 \
23	-DWITH_SYSTEMD=0
24		23
25	USE_LDCONFIG+= ${PREFIX}/lib/mysql	24	USE_LDCONFIG+= ${PREFIX}/lib/mysql
26		25

Lines 1-6 Link Here

(-)mysql57-client.01/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -569,8 +569,8 @@ ENDIF()	3	@@ -606,8 +606,8 @@ ENDIF()
4		4
5	ADD_SUBDIRECTORY(extra)	5	ADD_SUBDIRECTORY(extra)
6	ADD_SUBDIRECTORY(client)	6	ADD_SUBDIRECTORY(client)
Lines 10-16 Link Here
10		10
11	IF(UNIX)	11	IF(UNIX)
12	ADD_SUBDIRECTORY(man)	12	ADD_SUBDIRECTORY(man)
13	@@ -639,14 +639,13 @@ ELSE()	13	@@ -676,14 +676,13 @@ ELSE()
14	SET(CPACK_GENERATOR "TGZ")	14	SET(CPACK_GENERATOR "TGZ")
15	ENDIF()	15	ENDIF()
16	ADD_SUBDIRECTORY(packaging/WiX)	16	ADD_SUBDIRECTORY(packaging/WiX)
Lines 26-32 Link Here
26	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	26	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
27	INSTALL(FILES COPYING LICENSE.mysql	27	INSTALL(FILES COPYING LICENSE.mysql
28	DESTINATION ${INSTALL_DOCREADMEDIR}	28	DESTINATION ${INSTALL_DOCREADMEDIR}
29	@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	29	@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
30	PATTERN "sp-imp-spec.txt" EXCLUDE	30	PATTERN "sp-imp-spec.txt" EXCLUDE
31	)	31	)
32	ENDIF()	32	ENDIF()

Lines 1-6 Link Here

(-)mysql57-client.01/files/patch-client_CMakeLists.txt (-6 / +6 lines)
1	--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -121,6 +121,7 @@ IF(UNIX)	3	@@ -47,6 +47,7 @@ IF(UNIX)
4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})	4	TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
5	ENDIF(UNIX)	5	ENDIF(UNIX)
6		6
Lines 8-14 Link Here
8	IF(NOT WITHOUT_SERVER)	8	IF(NOT WITHOUT_SERVER)
9	MYSQL_ADD_EXECUTABLE(mysql_upgrade	9	MYSQL_ADD_EXECUTABLE(mysql_upgrade
10	upgrade/program.cc	10	upgrade/program.cc
11	@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(	11	@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
12	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)	12	TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)	13	ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
14	ENDIF()	14	ENDIF()
Lines 22-28 Link Here
22		22
23	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	23	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
24	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	24	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
25	@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	25	@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
26	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	26	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
27	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	27	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
28		28
Lines 33-39 Link Here
33		33
34	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	34	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
35	ADD_COMPILE_FLAGS(	35	ADD_COMPILE_FLAGS(
36	@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	36	@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
37	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	37	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
38	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	38	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
39		39
Lines 44-50 Link Here
44		44
45	IF(UNIX AND NOT WITHOUT_SERVER)	45	IF(UNIX AND NOT WITHOUT_SERVER)
46	MYSQL_ADD_EXECUTABLE(mysql_install_db	46	MYSQL_ADD_EXECUTABLE(mysql_install_db
47	@@ -196,7 +204,6 @@ IF(WIN32)	47	@@ -122,7 +130,6 @@ IF(WIN32)
48	ENDIF(WIN32)	48	ENDIF(WIN32)
49		49
50	SET_TARGET_PROPERTIES (	50	SET_TARGET_PROPERTIES (

Lines 1-4 Link Here

(-)mysql57-client.01/files/patch-support-files_CMakeLists.txt (-5 / +6 lines)
1	--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- support-files/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ support-files/CMakeLists.txt	2	+++ support-files/CMakeLists.txt
3	@@ -44,14 +44,17 @@ ELSE()	3	@@ -44,14 +44,17 @@ ELSE()
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
Lines 18-35 Link Here
18	FOREACH(script mysqld_multi.server mysql-log-rotate)	18	FOREACH(script mysqld_multi.server mysql-log-rotate)
19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	19	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
20	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	20	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
21	@@ -68,8 +71,10 @@ IF(UNIX)	21	@@ -68,9 +71,11 @@ IF(UNIX)
22	IF(INSTALL_SUPPORTFILESDIR)	22	IF(INSTALL_SUPPORTFILESDIR)
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
24	ENDIF()	24	ENDIF()
25	+ENDIF()	25	+ENDIF()
26		26
27	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)	27	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
28	+IF(FALSE)
29	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
30		28
		29	+IF(FALSE)
31	SET(bindir ${prefix}/${INSTALL_BINDIR})	30	SET(bindir ${prefix}/${INSTALL_BINDIR})
32	@@ -84,3 +89,4 @@ IF(UNIX)	31	SET(sbindir ${prefix}/${INSTALL_SBINDIR})
		32	SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR})
		33	@@ -83,3 +88,4 @@ IF(UNIX)
33	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	34	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
34	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	35	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
35	ENDIF()	36	ENDIF()

Lines 53-58 Link Here

(-)mysql57-client.01/pkg-plist (+4 lines)
53	include/mysql/mysql/plugin_ftparser.h	53	include/mysql/mysql/plugin_ftparser.h
54	include/mysql/mysql/plugin_ftparser.h.pp	54	include/mysql/mysql/plugin_ftparser.h.pp
55	include/mysql/mysql/plugin_group_replication.h	55	include/mysql/mysql/plugin_group_replication.h
		56	include/mysql/mysql/plugin_keyring.h
		57	include/mysql/mysql/plugin_keyring.h.pp
56	include/mysql/mysql/plugin_trace.h	58	include/mysql/mysql/plugin_trace.h
57	include/mysql/mysql/plugin_validate_password.h	59	include/mysql/mysql/plugin_validate_password.h
58	include/mysql/mysql/psi/mysql_file.h	60	include/mysql/mysql/psi/mysql_file.h
Lines 75-80 Link Here
75	include/mysql/mysql/service_my_plugin_log.h	77	include/mysql/mysql/service_my_plugin_log.h
76	include/mysql/mysql/service_my_snprintf.h	78	include/mysql/mysql/service_my_snprintf.h
77	include/mysql/mysql/service_mysql_alloc.h	79	include/mysql/mysql/service_mysql_alloc.h
		80	include/mysql/mysql/service_mysql_keyring.h
78	include/mysql/mysql/service_mysql_password_policy.h	81	include/mysql/mysql/service_mysql_password_policy.h
79	include/mysql/mysql/service_mysql_string.h	82	include/mysql/mysql/service_mysql_string.h
80	include/mysql/mysql/service_parser.h	83	include/mysql/mysql/service_parser.h
Lines 103-108 Link Here
103	include/mysql/plugin_audit.h	106	include/mysql/plugin_audit.h
104	include/mysql/plugin_ftparser.h	107	include/mysql/plugin_ftparser.h
105	include/mysql/plugin_group_replication.h	108	include/mysql/plugin_group_replication.h
		109	include/mysql/plugin_keyring.h
106	include/mysql/plugin_validate_password.h	110	include/mysql/plugin_validate_password.h
107	include/mysql/sql_common.h	111	include/mysql/sql_common.h
108	include/mysql/sql_state.h	112	include/mysql/sql_state.h

Lines 2-13 Link Here

(-)mysql57-server/Makefile (-48 / +60 lines)
2	# $FreeBSD: head/databases/mysql57-server/Makefile 412695 2016-04-07 22:23:19Z dim $	2	# $FreeBSD: head/databases/mysql57-server/Makefile 412695 2016-04-07 22:23:19Z dim $
3		3
4	PORTNAME= mysql	4	PORTNAME= mysql
5	PORTVERSION= 5.7.10	5	PORTVERSION= 5.7.12
6	PORTREVISION?= 5
7	CATEGORIES= databases ipv6	6	CATEGORIES= databases ipv6
8	MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost	7	MASTER_SITES= MYSQL/MySQL-5.7
9	PKGNAMESUFFIX?= 57-server	8	PKGNAMESUFFIX?= 57-server
10	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost	9	DISTNAME= ${PORTNAME}-boost-${PORTVERSION}
		10	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
11		11
12	MAINTAINER= mokhi64@gmail.com	12	MAINTAINER= mokhi64@gmail.com
13	COMMENT= Multithreaded SQL database (server)	13	COMMENT= Multithreaded SQL database (server)
Lines 15-52 Link Here
15	LICENSE= GPLv2	15	LICENSE= GPLv2
16		16
17	SLAVEDIRS= databases/mysql57-client	17	SLAVEDIRS= databases/mysql57-client
18	USES= cmake:outsource shebangfix	18	USES= bison:build cmake:outsource compiler:c++11-lib cpe libedit perl5 shebangfix
19		19
20	OPTIONS_RADIO= SSL ZLIB	20	USE_OPENSSL= yes
21	OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL	21	USE_PERL5= run
22	OPTIONS_RADIO_ZLIB= BUNDLED_ZLIB SYSTEM_ZLIB
23	OPTIONS_DEFAULT+= OPENSSL SYSTEM_ZLIB
24	NO_OPTIONS_SORT= yes
25
26	BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL
27	WITHOUT_SSL_DESC= No SSL/TLS support
28	BUNDLED_ZLIB_DESC= Use bundled ZLib
29	SYSTEM_ZLIB_DESC= Use system ZLib
30		22
31	CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \	23	MY_DBDIR= /var/db/mysql
		24	MY_SECDIR= /var/db/mysql_secure
		25	MY_TMPDIR= /var/db/mysql_tmpdir
		26
		27	LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2 \
		28	liblz4.so:${PORTSDIR}/archivers/liblz4
		29
		30	CMAKE_BUILD_TYPE= Release
		31
		32	CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
		33	-DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \
		34	-DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \
		35	-DINSTALL_DOCDIR="share/doc/mysql" \
32	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \	36	-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
33	-DINSTALL_INCLUDEDIR="include/mysql" \	37	-DINSTALL_INCLUDEDIR="include/mysql" \
34	-DINSTALL_INFODIR="info" \	38	-DINSTALL_INFODIR="info" \
35	-DINSTALL_LIBDIR="lib/mysql" \	39	-DINSTALL_LIBDIR="lib/mysql" \
36	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
37	-DINSTALL_MANDIR="man" \	40	-DINSTALL_MANDIR="man" \
38	-DINSTALL_MYSQLDATADIR="/var/db/mysql" \	41	-DINSTALL_MYSQLDATADIR="${MY_DBDIR}" \
		42	-DINSTALL_MYSQLKEYRINGDIR="etc/mysql/keyring" \
39	-DINSTALL_MYSQLSHAREDIR="share/mysql" \	43	-DINSTALL_MYSQLSHAREDIR="share/mysql" \
40	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \	44	-DINSTALL_MYSQLTESTDIR="share/mysql/tests" \
41	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \	45	-DINSTALL_PLUGINDIR="lib/mysql/plugin" \
42	-DINSTALL_SBINDIR="libexec" \	46	-DINSTALL_SBINDIR="libexec" \
43	-DINSTALL_SCRIPTDIR="bin" \	47	-DINSTALL_SCRIPTDIR="bin" \
		48	-DINSTALL_SECURE_FILE_PRIVDIR="${MY_SECDIR}" \
44	-DINSTALL_SHAREDIR="share" \	49	-DINSTALL_SHAREDIR="share" \
45	-DINSTALL_SUPPORTFILESDIR="share/mysql" \	50	-DINSTALL_SUPPORTFILESDIR="share/mysql" \
46	-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \	51	-DMYSQL_KEYRINGDIR="${ETCDIR}/keyring" \
47	-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \	52	-DSYSCONFDIR="${ETCDIR}" \
48	-DINSTALL_LAYOUT=STANDALONE \	53	-DWITH_BOOST="${WRKSRC}/boost" \
49	-DWITH_INNODB_EXTRA_DEBUG=0	54	-DWITH_EDITLINE=system \
		55	-DWITH_LIBEVENT=system \
		56	-DWITH_LZ4=system \
		57	-DWITH_ZLIB=system \
		58	-DWITH_PIC=1
50		59
51	SHEBANG_FILES= scripts/.pl scripts/*.sh	60	SHEBANG_FILES= scripts/.pl scripts/*.sh
52		61
Lines 54-79 Link Here
54	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.	63	.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
55	.endif	64	.endif
56		65
57	BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled	66	SUB_LIST= MY_DBDIR=${MY_DBDIR} \
58	OPENSSL_USE= OPENSSL=yes	67	MY_SECDIR=${MY_SECDIR} \
59	WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no	68	MY_TMPDIR=${MY_TMPDIR}
60	BUNDLED_ZLIB_CMAKE_ON= -DWITH_ZLIB=bundled	69
61	SYSTEM_ZLIB_CMAKE_ON= -DWITH_ZLIB=system	70	PLIST_SUB= MY_DBDIR=${MY_DBDIR} \
		71	MY_SECDIR=${MY_SECDIR} \
		72	MY_TMPDIR=${MY_TMPDIR}
62		73
63	# MySQL-Server part	74	# MySQL-Server part
64	.if !defined(CLIENT_ONLY)	75	.if !defined(CLIENT_ONLY)
65	USE_MYSQL= yes	76	USE_MYSQL= yes
66	WANT_MYSQL_VER= 57	77	WANT_MYSQL_VER= 57
67		78
68	USES+= bison:build cpe perl5	79	CONFLICTS_INSTALL= mysql5[0-68-9]-server-* \
69	USE_PERL5= run	80	mysql[0-46-9][0-9]-server-* \
70		81	mariadb[0-9][0-9]-server-* \
71	CONFLICTS_INSTALL= mariadb[0-9]-server- \	82	percona[0-9][0-9]-server-*
72	mysql[0-46-9][0-689]-server-* \
73	percona[0-9]-server-
74		83
75	USE_RC_SUBR= mysql-server	84	USE_RC_SUBR= mysql-server
76		85
		86	SUB_FILES= my.cnf.sample
		87
77	USERS= mysql	88	USERS= mysql
78	GROUPS= mysql	89	GROUPS= mysql
79		90
Lines 116-145 Link Here
116		127
117	PERFSCHM_SUB_LIST+= PERFSCHEMRC=""	128	PERFSCHM_SUB_LIST+= PERFSCHEMRC=""
118	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"	129	PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema"
119
120	.else
121	USES+= libedit
122	LIB_DEPENDS+= libevent.so:${PORTSDIR}/devel/libevent2
123
124	CMAKE_ARGS+= -DWITH_EDITLINE=system \
125	-DWITH_LIBEVENT=system
126	.endif	130	.endif
127		131
128	.include <bsd.port.pre.mk>	132	.include <bsd.port.pre.mk>
129		133
130	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000	134	.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
131	CC= clang	135	CC= clang
132	CXX= clang++	136	CXX= clang++
133	CPP= clang-cpp	137	CPP= clang-cpp
134	OPENSSL_CMAKE_ON= -DWITH_SSL=system	138	CMAKE_ARGS+= -DWITH_SSL=yes
135	.elif ${OSVERSION} >= 1000000	139	.elif ${OSVERSION} >= 1000000
136	OPENSSL_CMAKE_ON= -DWITH_SSL=yes	140	CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE}
137	.endif	141	.endif
138		142
139	post-extract:
140	@${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h
141
142	post-patch:	143	post-patch:
143	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt	144	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
144		145
		146	.if !defined(CLIENT_ONLY)
		147	post-install:
		148	${MKDIR} ${STAGEDIR}${ETCDIR}
		149	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
		150
		151	post-stage:
		152	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
		153	${MKDIR} ${STAGEDIR}${MY_SECDIR}
		154	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
		155	.endif
		156
145	.include <bsd.port.post.mk>	157	.include <bsd.port.post.mk>

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 = 8192
	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 1-6 Link Here

(-)mysql57-server/files/patch-CMakeLists.txt (-5 / +5 lines)
1	--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -577,12 +577,10 @@ IF(UNIX)	3	@@ -614,12 +614,10 @@ IF(UNIX)
4	ENDIF()	4	ENDIF()
5		5
6	IF(NOT WITHOUT_SERVER)	6	IF(NOT WITHOUT_SERVER)
Lines 13-19 Link Here
13	ENDIF(WITH_EMBEDDED_SERVER)	13	ENDIF(WITH_EMBEDDED_SERVER)
14	ENDIF()	14	ENDIF()
15		15
16	@@ -591,8 +589,6 @@ ENDIF()	16	@@ -628,8 +626,6 @@ ENDIF()
17	ADD_SUBDIRECTORY(scripts)	17	ADD_SUBDIRECTORY(scripts)
18		18
19	IF(NOT WITHOUT_SERVER)	19	IF(NOT WITHOUT_SERVER)
Lines 22-28 Link Here
22	ADD_SUBDIRECTORY(support-files)	22	ADD_SUBDIRECTORY(support-files)
23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)	23	IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
24	ADD_SUBDIRECTORY(internal)	24	ADD_SUBDIRECTORY(internal)
25	@@ -647,6 +643,7 @@ ENDIF()	25	@@ -684,6 +680,7 @@ ENDIF()
26	#	26	#
27	# RPM installs documentation directly from the source tree	27	# RPM installs documentation directly from the source tree
28	#	28	#
Lines 30-36 Link Here
30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")	30	IF(NOT INSTALL_LAYOUT MATCHES "RPM")
31	INSTALL(FILES COPYING LICENSE.mysql	31	INSTALL(FILES COPYING LICENSE.mysql
32	DESTINATION ${INSTALL_DOCREADMEDIR}	32	DESTINATION ${INSTALL_DOCREADMEDIR}
33	@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")	33	@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
34	PATTERN "sp-imp-spec.txt" EXCLUDE	34	PATTERN "sp-imp-spec.txt" EXCLUDE
35	)	35	)
36	ENDIF()	36	ENDIF()

Lines 1-6 Link Here

(-)mysql57-server/files/patch-client_CMakeLists.txt (-9 / +9 lines)
1	--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ client/CMakeLists.txt	2	+++ client/CMakeLists.txt
3	@@ -38,8 +38,6 @@ ADD_DEFINITIONS(	3	@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
4		4
5	## Subdirectory with common client code.	5	## Subdirectory with common client code.
6	ADD_SUBDIRECTORY(base)	6	ADD_SUBDIRECTORY(base)
Lines 9-16 Link Here
9		9
10	## We will need libeay32.dll and ssleay32.dll when running client executables.	10	## We will need libeay32.dll and ssleay32.dll when running client executables.
11	COPY_OPENSSL_DLLS(copy_openssl_client)	11	COPY_OPENSSL_DLLS(copy_openssl_client)
12	@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F	12	@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
13	ENDIF()	13	INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
14		14
15	ADD_DEFINITIONS(${SSL_DEFINES})	15	ADD_DEFINITIONS(${SSL_DEFINES})
16	+IF(FALSE)	16	+IF(FALSE)
Lines 23-29 Link Here
23		23
24	IF(NOT WITHOUT_SERVER)	24	IF(NOT WITHOUT_SERVER)
25	MYSQL_ADD_EXECUTABLE(mysql_upgrade	25	MYSQL_ADD_EXECUTABLE(mysql_upgrade
26	@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli	26	@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)	27	ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)	28	TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
29		29
Lines 31-37 Link Here
31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)	31	MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)	32	TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
33		33
34	@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc	34	@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
35		35
36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)	36	MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)	37	TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
Lines 44-50 Link Here
44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)	44	MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
45	ADD_COMPILE_FLAGS(	45	ADD_COMPILE_FLAGS(
46	mysqlbinlog.cc	46	mysqlbinlog.cc
47	@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli	47	@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
48		48
49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)	49	MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)	50	TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
Lines 52-58 Link Here
52		52
53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)	53	MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)	54	TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
55	@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)	55	@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)	56	ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
57	ENDIF()	57	ENDIF()
58		58
Lines 64-70 Link Here
64		64
65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".	65	# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
66	IF(WIN32)	66	IF(WIN32)
67	@@ -197,11 +203,6 @@ ENDIF(WIN32)	67	@@ -123,11 +129,6 @@ ENDIF(WIN32)
68		68
69	SET_TARGET_PROPERTIES (	69	SET_TARGET_PROPERTIES (
70	mysql_plugin	70	mysql_plugin

Lines 1-13 Link Here

(-)mysql57-server/files/patch-include_CMakeLists.txt (-6 / +9 lines)
1	--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC	1	--- include/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
2	+++ include/CMakeLists.txt	2	+++ include/CMakeLists.txt
3	@@ -68,11 +68,13 @@ SET(HEADERS	3	@@ -69,14 +69,13 @@ SET(HEADERS
4	${HEADERS_GEN_CONFIGURE}	4	${HEADERS_GEN_CONFIGURE}
5	)	5	)
6		6
7	+IF(FALSE)	7	+IF(FALSE)
8	INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})	8	INSTALL(FILES
9	INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)	9	../libbinlogevents/export/binary_log_types.h
10	INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development	10	DESTINATION ${INSTALL_INCLUDEDIR}
		11	- COMPONENT Development)
		12	-INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
		13	-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development
11	PATTERN "*.h"	14	PATTERN "*.h"
12	PATTERN "psi_abi*" EXCLUDE	15	PATTERN "psi_abi*" EXCLUDE
13	)	16	)

Line 0 Link Here

(-)mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt (+20 lines)
	1	--- rapid/plugin/x/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
	2	+++ rapid/plugin/x/CMakeLists.txt
	3	@@ -91,14 +91,14 @@ ELSE()
	4	${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
	5	${CMAKE_SOURCE_DIR}/include #temporary
	6	${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
	7	- ${SSL_INCLUDE_DIRS}
	8	- ${ZLIB_INCLUDE_DIR}
	9	+ ${BOOST_INCLUDE_DIR}
	10	)
	11
	12	INCLUDE_DIRECTORIES(SYSTEM
	13	- ${BOOST_INCLUDE_DIR}
	14	${PROTOBUF_INCLUDE_DIRS}
	15	${LIBEVENT_INCLUDE_DIR}
	16	+ ${SSL_INCLUDE_DIRS}
	17	+ ${ZLIB_INCLUDE_DIR}
	18	)
	19
	20	IF(XPLUGIN_NO_LITE_PROTOBUF)

Line 0 Link Here

(-)mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt (+18 lines)
	1	--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
	2	+++ rapid/unittest/gunit/xplugin/CMakeLists.txt
	3	@@ -65,7 +65,6 @@ ENDIF()
	4	ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO)
	5
	6	INCLUDE_DIRECTORIES(SYSTEM
	7	- ${BOOST_INCLUDE_DIR}
	8	${PROTOBUF_INCLUDE_DIRS}
	9	${SSL_INCLUDE_DIRS}
	10	${LIBEVENT_INCLUDE_DIR}
	11	@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
	12	)
	13
	14	INCLUDE_DIRECTORIES(
	15	+ ${BOOST_INCLUDE_DIR}
	16	${CMAKE_SOURCE_DIR}/testing/include
	17	${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include
	18	${PROJECT_SOURCE_DIR}/rapid/plugin/x/ngs/include/ngs

Lines 1-4 Link Here

(-)mysql57-server/files/patch-sql_sys__vars.cc (-4 / +4 lines)
1	--- sql/sys_vars.cc.orig 2015-11-29 19:16:24 UTC	1	--- sql/sys_vars.cc.orig 2016-03-28 18:06:12 UTC
2	+++ sql/sys_vars.cc	2	+++ sql/sys_vars.cc
3	@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim	3	@@ -1734,7 +1734,7 @@ static Sys_var_ulong Sys_interactive_tim
4	"connection before closing it",	4	"connection before closing it",
Lines 9-15 Link Here
9		9
10	static Sys_var_ulong Sys_join_buffer_size(	10	static Sys_var_ulong Sys_join_buffer_size(
11	"join_buffer_size",	11	"join_buffer_size",
12	@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou	12	@@ -2552,7 +2552,7 @@ static Sys_var_ulong Sys_net_read_timeou
13	"Number of seconds to wait for more data from a connection before "	13	"Number of seconds to wait for more data from a connection before "
14	"aborting the read",	14	"aborting the read",
15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),	15	SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
Lines 18-24 Link Here
18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	18	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
19	ON_UPDATE(fix_net_read_timeout));	19	ON_UPDATE(fix_net_read_timeout));
20		20
21	@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo	21	@@ -2568,7 +2568,7 @@ static Sys_var_ulong Sys_net_write_timeo
22	"Number of seconds to wait for a block to be written to a connection "	22	"Number of seconds to wait for a block to be written to a connection "
23	"before aborting the write",	23	"before aborting the write",
24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),	24	SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
Lines 27-33 Link Here
27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),	27	NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
28	ON_UPDATE(fix_net_write_timeout));	28	ON_UPDATE(fix_net_write_timeout));
29		29
30	@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou	30	@@ -4083,7 +4083,7 @@ static Sys_var_ulong Sys_net_wait_timeou
31	"The number of seconds the server waits for activity on a "	31	"The number of seconds the server waits for activity on a "
32	"connection before closing it",	32	"connection before closing it",
33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),	33	SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),