Attachment 169320 Details for Bug 206998 – patch for upgrade to mysql5.7.12

[patch] patch for upgrade to mysql5.7.12

mysql57-update.diff (text/plain), 46.58 KB, created by Markus Kohlmeyer on 2016-04-14 20:27:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-04-14 20:27:42 UTC

Size: 46.58 KB

patch

obsolete

>diff -Naur mysql57-client.00/Makefile mysql57-client.01/Makefile
>--- mysql57-client.00/Makefile	2016-04-14 13:00:42.160394000 +0200
>+++ mysql57-client.01/Makefile	2016-04-14 14:08:35.831683000 +0200
>@@ -2,7 +2,6 @@
> # $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)
>@@ -15,12 +14,12 @@
> PATCHDIR=	${.CURDIR}/files
> PLIST=		${.CURDIR}/pkg-plist
> 
>-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-*
>+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+=	-DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \
>-		-DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \
>-		-DWITHOUT_SERVER=1 \
>-		-DWITH_SYSTEMD=0
>+CMAKE_ARGS+=	-DWITHOUT_SERVER=1
> 
> USE_LDCONFIG+=	${PREFIX}/lib/mysql
> 
>diff -Naur mysql57-client.00/files/patch-CMakeLists.txt mysql57-client.01/files/patch-CMakeLists.txt
>--- mysql57-client.00/files/patch-CMakeLists.txt	2016-04-14 13:00:42.160659000 +0200
>+++ mysql57-client.01/files/patch-CMakeLists.txt	2016-04-14 14:08:35.831953000 +0200
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ CMakeLists.txt
>-@@ -569,8 +569,8 @@ ENDIF()
>+@@ -606,8 +606,8 @@ ENDIF()
>  
>  ADD_SUBDIRECTORY(extra)
>  ADD_SUBDIRECTORY(client)
>@@ -10,7 +10,7 @@
>  
>  IF(UNIX)
>    ADD_SUBDIRECTORY(man)
>-@@ -639,14 +639,13 @@ ELSE()
>+@@ -676,14 +676,13 @@ ELSE()
>    SET(CPACK_GENERATOR "TGZ")
>  ENDIF() 
>  ADD_SUBDIRECTORY(packaging/WiX)
>@@ -26,7 +26,7 @@
>  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>    INSTALL(FILES COPYING LICENSE.mysql 
>    DESTINATION ${INSTALL_DOCREADMEDIR} 
>-@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>      PATTERN "sp-imp-spec.txt" EXCLUDE
>    )
>  ENDIF()
>diff -Naur mysql57-client.00/files/patch-client_CMakeLists.txt mysql57-client.01/files/patch-client_CMakeLists.txt
>--- mysql57-client.00/files/patch-client_CMakeLists.txt	2016-04-14 13:00:42.160734000 +0200
>+++ mysql57-client.01/files/patch-client_CMakeLists.txt	2016-04-14 14:08:35.832028000 +0200
>@@ -1,6 +1,6 @@
>---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ client/CMakeLists.txt
>-@@ -121,6 +121,7 @@ IF(UNIX)
>+@@ -47,6 +47,7 @@ IF(UNIX)
>    TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
>  ENDIF(UNIX)
>  
>@@ -8,7 +8,7 @@
>  IF(NOT WITHOUT_SERVER)
>    MYSQL_ADD_EXECUTABLE(mysql_upgrade
>      upgrade/program.cc
>-@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS(
>+@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
>  TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
>  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
>  ENDIF()
>@@ -22,7 +22,7 @@
>  
>  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
>-@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
>+@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
>  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
>  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
>  
>@@ -33,7 +33,7 @@
>  
>  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
>  ADD_COMPILE_FLAGS(
>-@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
>+@@ -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)
>  
>@@ -44,7 +44,7 @@
>  
>  IF(UNIX AND NOT WITHOUT_SERVER)
>    MYSQL_ADD_EXECUTABLE(mysql_install_db
>-@@ -196,7 +204,6 @@ IF(WIN32)
>+@@ -122,7 +130,6 @@ IF(WIN32)
>  ENDIF(WIN32)
>  
>  SET_TARGET_PROPERTIES (
>diff -Naur mysql57-client.00/files/patch-cmake_build__configurations_compiler__options.cmake mysql57-client.01/files/patch-cmake_build__configurations_compiler__options.cmake
>--- mysql57-client.00/files/patch-cmake_build__configurations_compiler__options.cmake	2016-04-14 13:00:42.160815000 +0200
>+++ mysql57-client.01/files/patch-cmake_build__configurations_compiler__options.cmake	2016-04-14 14:08:35.832100000 +0200
>@@ -1,4 +1,4 @@
>---- cmake/build_configurations/compiler_options.cmake.orig	2015-11-29 19:16:24 UTC
>+--- cmake/build_configurations/compiler_options.cmake.orig	2016-03-28 18:06:12 UTC
> +++ cmake/build_configurations/compiler_options.cmake
> @@ -28,7 +28,7 @@ IF(UNIX)  
>  
>diff -Naur mysql57-client.00/files/patch-cmake_os_DragonFly.cmake mysql57-client.01/files/patch-cmake_os_DragonFly.cmake
>--- mysql57-client.00/files/patch-cmake_os_DragonFly.cmake	2016-04-14 13:00:42.160906000 +0200
>+++ mysql57-client.01/files/patch-cmake_os_DragonFly.cmake	2016-04-14 14:08:35.832205000 +0200
>@@ -1,4 +1,4 @@
>---- cmake/os/DragonFly.cmake.orig	2015-12-17 10:53:10 UTC
>+--- cmake/os/DragonFly.cmake.orig	2016-04-14 10:16:17 UTC
> +++ cmake/os/DragonFly.cmake
> @@ -0,0 +1,24 @@
> +INCLUDE(CheckCSourceRuns)
>diff -Naur mysql57-client.00/files/patch-cmd-line-utils_libedit_chartype.h mysql57-client.01/files/patch-cmd-line-utils_libedit_chartype.h
>--- mysql57-client.00/files/patch-cmd-line-utils_libedit_chartype.h	2016-04-14 13:00:42.160997000 +0200
>+++ mysql57-client.01/files/patch-cmd-line-utils_libedit_chartype.h	2016-04-14 14:08:35.832297000 +0200
>@@ -1,4 +1,4 @@
>---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
>+--- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
> +++ cmd-line-utils/libedit/chartype.h
> @@ -49,7 +49,7 @@
>    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>diff -Naur mysql57-client.00/files/patch-cmd-line-utils_libedit_vi.c mysql57-client.01/files/patch-cmd-line-utils_libedit_vi.c
>--- mysql57-client.00/files/patch-cmd-line-utils_libedit_vi.c	2016-04-14 13:00:42.161086000 +0200
>+++ mysql57-client.01/files/patch-cmd-line-utils_libedit_vi.c	2016-04-14 14:08:35.832388000 +0200
>@@ -1,4 +1,4 @@
>---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 UTC
>+--- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
> +++ cmd-line-utils/libedit/vi.c
> @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
>   * NB: posix implies that we should enter insert mode, however
>diff -Naur mysql57-client.00/files/patch-extra_CMakeLists.txt mysql57-client.01/files/patch-extra_CMakeLists.txt
>--- mysql57-client.00/files/patch-extra_CMakeLists.txt	2016-04-14 13:00:42.161175000 +0200
>+++ mysql57-client.01/files/patch-extra_CMakeLists.txt	2016-04-14 14:08:35.832488000 +0200
>@@ -1,4 +1,4 @@
>---- extra/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- extra/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ extra/CMakeLists.txt
> @@ -45,6 +45,7 @@ ENDIF()
>  
>diff -Naur mysql57-client.00/files/patch-include_CMakeLists.txt mysql57-client.01/files/patch-include_CMakeLists.txt
>--- mysql57-client.00/files/patch-include_CMakeLists.txt	2016-04-14 13:00:42.161263000 +0200
>+++ mysql57-client.01/files/patch-include_CMakeLists.txt	2016-04-14 14:08:35.832575000 +0200
>@@ -1,6 +1,6 @@
>---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ include/CMakeLists.txt
>-@@ -37,6 +37,7 @@ SET(HEADERS_ABI 
>+@@ -38,6 +38,7 @@ SET(HEADERS_ABI 
>  
>  SET(HEADERS 
>    ${HEADERS_ABI} 
>@@ -8,4 +8,3 @@
>    my_dbug.h 
>    m_string.h
>    my_sys.h 
>-
>diff -Naur mysql57-client.00/files/patch-include_my__compare.h mysql57-client.01/files/patch-include_my__compare.h
>--- mysql57-client.00/files/patch-include_my__compare.h	2016-04-14 13:00:42.161351000 +0200
>+++ mysql57-client.01/files/patch-include_my__compare.h	2016-04-14 14:08:35.832663000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_compare.h.orig	2015-11-29 19:16:24 UTC
>+--- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
> +++ include/my_compare.h
> @@ -40,7 +40,7 @@ extern "C" {
>    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
>diff -Naur mysql57-client.00/files/patch-include_myisam.h mysql57-client.01/files/patch-include_myisam.h
>--- mysql57-client.00/files/patch-include_myisam.h	2016-04-14 13:00:42.161439000 +0200
>+++ mysql57-client.01/files/patch-include_myisam.h	2016-04-14 14:08:35.832751000 +0200
>@@ -1,4 +1,4 @@
>---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
>+--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
> +++ include/myisam.h
> @@ -45,7 +45,7 @@ extern "C" {
>    The following defines can be increased if necessary.
>diff -Naur mysql57-client.00/files/patch-libmysql_CMakeLists.txt mysql57-client.01/files/patch-libmysql_CMakeLists.txt
>--- mysql57-client.00/files/patch-libmysql_CMakeLists.txt	2016-04-14 13:00:42.161511000 +0200
>+++ mysql57-client.01/files/patch-libmysql_CMakeLists.txt	2016-04-14 14:08:35.832855000 +0200
>@@ -1,4 +1,4 @@
>---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ libmysql/CMakeLists.txt
> @@ -260,7 +260,7 @@ IF(NOT DISABLE_SHARED)
>      COMPONENT SharedLibraries)
>diff -Naur mysql57-client.00/files/patch-mysys__ssl_my__default.cc mysql57-client.01/files/patch-mysys__ssl_my__default.cc
>--- mysql57-client.00/files/patch-mysys__ssl_my__default.cc	2016-04-14 13:00:42.161672000 +0200
>+++ mysql57-client.01/files/patch-mysys__ssl_my__default.cc	2016-04-14 14:08:35.833035000 +0200
>@@ -1,4 +1,4 @@
>---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
>+--- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
> +++ mysys_ssl/my_default.cc
> @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
>  
>diff -Naur mysql57-client.00/files/patch-scripts_CMakeLists.txt mysql57-client.01/files/patch-scripts_CMakeLists.txt
>--- mysql57-client.00/files/patch-scripts_CMakeLists.txt	2016-04-14 13:00:42.161746000 +0200
>+++ mysql57-client.01/files/patch-scripts_CMakeLists.txt	2016-04-14 14:08:35.833125000 +0200
>@@ -1,4 +1,4 @@
>---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ scripts/CMakeLists.txt
> @@ -43,6 +43,7 @@ ELSE()
>    MESSAGE(FATAL_ERROR "Cannot concatenate files")
>diff -Naur mysql57-client.00/files/patch-storage_myisam_mi__dynrec.c mysql57-client.01/files/patch-storage_myisam_mi__dynrec.c
>--- mysql57-client.00/files/patch-storage_myisam_mi__dynrec.c	2016-04-14 13:00:42.161819000 +0200
>+++ mysql57-client.01/files/patch-storage_myisam_mi__dynrec.c	2016-04-14 14:08:35.833214000 +0200
>@@ -1,4 +1,4 @@
>---- storage/myisam/mi_dynrec.c.orig	2015-12-14 07:39:39 UTC
>+--- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
> +++ storage/myisam/mi_dynrec.c
> @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
>      DBUG_RETURN(1);
>diff -Naur mysql57-client.00/files/patch-support-files_CMakeLists.txt mysql57-client.01/files/patch-support-files_CMakeLists.txt
>--- mysql57-client.00/files/patch-support-files_CMakeLists.txt	2016-04-14 13:00:42.161893000 +0200
>+++ mysql57-client.01/files/patch-support-files_CMakeLists.txt	2016-04-14 14:08:35.833302000 +0200
>@@ -1,4 +1,4 @@
>---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- 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})
>@@ -18,18 +18,19 @@
>    FOREACH(script  mysqld_multi.server mysql-log-rotate)
>      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
>                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
>-@@ -68,8 +71,10 @@ IF(UNIX)
>+@@ -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})
>-@@ -84,3 +89,4 @@ IF(UNIX)
>+   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()
>diff -Naur mysql57-client.00/pkg-plist mysql57-client.01/pkg-plist
>--- mysql57-client.00/pkg-plist	2016-04-14 13:00:42.162031000 +0200
>+++ mysql57-client.01/pkg-plist	2016-04-14 14:08:35.833451000 +0200
>@@ -53,6 +53,8 @@
> include/mysql/mysql/plugin_ftparser.h
> include/mysql/mysql/plugin_ftparser.h.pp
> include/mysql/mysql/plugin_group_replication.h
>+include/mysql/mysql/plugin_keyring.h
>+include/mysql/mysql/plugin_keyring.h.pp
> include/mysql/mysql/plugin_trace.h
> include/mysql/mysql/plugin_validate_password.h
> include/mysql/mysql/psi/mysql_file.h
>@@ -75,6 +77,7 @@
> include/mysql/mysql/service_my_plugin_log.h
> include/mysql/mysql/service_my_snprintf.h
> include/mysql/mysql/service_mysql_alloc.h
>+include/mysql/mysql/service_mysql_keyring.h
> include/mysql/mysql/service_mysql_password_policy.h
> include/mysql/mysql/service_mysql_string.h
> include/mysql/mysql/service_parser.h
>@@ -103,6 +106,7 @@
> include/mysql/plugin_audit.h
> include/mysql/plugin_ftparser.h
> include/mysql/plugin_group_replication.h
>+include/mysql/plugin_keyring.h
> include/mysql/plugin_validate_password.h
> include/mysql/sql_common.h
> include/mysql/sql_state.h
>diff -Naur mysql57-server/Makefile mysql57-server/Makefile
>--- mysql57-server/Makefile	2016-04-14 13:00:55.976921000 +0200
>+++ mysql57-server/Makefile	2016-04-14 15:13:18.745005000 +0200
>@@ -2,12 +2,12 @@
> # $FreeBSD: head/databases/mysql57-server/Makefile 412695 2016-04-07 22:23:19Z dim $
> 
> PORTNAME=	mysql
>-PORTVERSION=	5.7.10
>-PORTREVISION?=	5
>+PORTVERSION=	5.7.12
> CATEGORIES=	databases ipv6
>-MASTER_SITES=	MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost
>+MASTER_SITES=	MYSQL/MySQL-5.7
> PKGNAMESUFFIX?=	57-server
>-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost
>+DISTNAME=	${PORTNAME}-boost-${PORTVERSION}
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=	mokhi64@gmail.com
> COMMENT=	Multithreaded SQL database (server)
>@@ -15,38 +15,47 @@
> LICENSE=	GPLv2
> 
> SLAVEDIRS=	databases/mysql57-client
>-USES=		cmake:outsource shebangfix
>+USES=		bison:build cmake:outsource compiler:c++11-lib cpe libedit perl5 shebangfix
> 
>-OPTIONS_RADIO=		SSL ZLIB
>-OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
>-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
>+USE_OPENSSL=	yes
>+USE_PERL5=	run
> 
>-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
>+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="/var/db/mysql" \
>+		-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" \
>-		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
>-		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
>-		-DINSTALL_LAYOUT=STANDALONE \
>-		-DWITH_INNODB_EXTRA_DEBUG=0
>+		-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
> 
>@@ -54,26 +63,28 @@
> .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
> .endif
> 
>-BUNDLED_SSL_CMAKE_ON=	-DWITH_SSL=bundled
>-OPENSSL_USE=		OPENSSL=yes
>-WITHOUT_SSL_CMAKE_ON=	-DWITH_SSL=no
>-BUNDLED_ZLIB_CMAKE_ON=	-DWITH_ZLIB=bundled
>-SYSTEM_ZLIB_CMAKE_ON=	-DWITH_ZLIB=system
>+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
> 
>-USES+=		bison:build cpe perl5
>-USE_PERL5=	run
>-
>-CONFLICTS_INSTALL=	mariadb[0-9]*-server-* \
>-			mysql[0-46-9][0-689]-server-* \
>-			percona[0-9]*-server-*
>+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-*
> 
> USE_RC_SUBR=	mysql-server
> 
>+SUB_FILES=	my.cnf.sample
>+
> USERS=		mysql
> GROUPS=		mysql
> 
>@@ -116,30 +127,31 @@
> 
> 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
>-OPENSSL_CMAKE_ON=	-DWITH_SSL=system
>+CC=		clang
>+CXX=		clang++
>+CPP=		clang-cpp
>+CMAKE_ARGS+=	-DWITH_SSL=yes
> .elif ${OSVERSION} >= 1000000
>-OPENSSL_CMAKE_ON=	-DWITH_SSL=yes
>+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>
>diff -Naur mysql57-server/distinfo mysql57-server/distinfo
>--- mysql57-server/distinfo	2016-04-14 13:00:55.976994000 +0200
>+++ mysql57-server/distinfo	2016-04-14 14:08:52.788706000 +0200
>@@ -1,4 +1,2 @@
>-SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74
>-SIZE (mysql-5.7.10.tar.gz) = 48919371
>-SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac
>-SIZE (boost_1_59_0.tar.gz) = 83709983
>+SHA256 (mysql-boost-5.7.12.tar.gz) = 3990c78b4064e4e972e763d62449cb8f930717b3dd2ddcbbaeeaa0f644d5333d
>+SIZE (mysql-boost-5.7.12.tar.gz) = 60604385
>diff -Naur mysql57-server/files/my.cnf.sample.in mysql57-server/files/my.cnf.sample.in
>--- mysql57-server/files/my.cnf.sample.in	1970-01-01 01:00:00.000000000 +0100
>+++ mysql57-server/files/my.cnf.sample.in	2016-04-14 22:19:35.680770000 +0200
>@@ -0,0 +1,62 @@
>+[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
>diff -Naur mysql57-server/files/mysql-server.in mysql57-server/files/mysql-server.in
>--- mysql57-server/files/mysql-server.in	2016-04-14 13:00:55.977396000 +0200
>+++ mysql57-server/files/mysql-server.in	2016-04-14 19:40:22.424658000 +0200
>@@ -14,10 +14,12 @@
> # 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 "/var/db/mysql"
>+# 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_dbdir}/my.cnf".
>+#			Default to "${mysql_confdir}/my.cnf".
> # mysql_pidfile (str):	Custum PID file path and name.
> #			Default to "${mysql_dbdir}/${hostname}.pid".
> # mysql_args (str):	Custom additional arguments to be passed
>@@ -33,30 +35,43 @@
> 
> : ${mysql_enable="NO"}
> : ${mysql_limits="NO"}
>-: ${mysql_dbdir="/var/db/mysql"}
>+: ${mysql_dbdir="%%MY_DBDIR%%"}
>+: ${mysql_confdir="%%ETCDIR%%"}
>+if [ -f "${mysql_dbdir}/my.cnf" ]; then
> : ${mysql_optfile="${mysql_dbdir}/my.cnf"}
>+else
>+: ${mysql_optfile="${mysql_confdir}/my.cnf"}
>+fi
> 
> mysql_user="mysql"
> mysql_limits_args="-e -U ${mysql_user}"
> : ${hostname:=`/bin/hostname`}
> pidfile=${mysql_pidfile:-"${mysql_dbdir}/${hostname}.pid"}
> command="/usr/sbin/daemon"
>-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%%"
>+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%%"
> procname="%%PREFIX%%/libexec/mysqld"
> start_precmd="${name}_prestart"
> start_postcmd="${name}_poststart"
> mysql_install_db="%%PREFIX%%/bin/mysql_install_db"
>-mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}"
>+mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --user=${mysql_user}"
> 
> mysql_create_auth_tables()
> {
> 	eval $mysql_install_db $mysql_install_db_args >/dev/null 2>/dev/null
>-        [ $? -eq 0 ] && chown -R ${mysql_user}:${mysql_user} ${mysql_dbdir}
> }
> 
> mysql_prestart()
> {
>-	if [ ! -d "${mysql_dbdir}/mysql/." ]; then
>+	if [ -f "${mysql_dbdir}/my.cnf" ]; then
>+		echo ""
>+		echo "Please keep in mind that the default location for my.cnf will be changed"
>+		echo "from \"%%MY_DBDIR%%/my.cnf\" to \"%%ETCDIR%%/my.cnf\" in the near"
>+		echo "future.  If you do not want to move your my.cnf to the new location then"
>+		echo "you must set \"mysql_optfile\" in /etc/rc.conf to \"/var/db/mysql/my.cnf\"."
>+		echo ""
>+	fi
>+
>+	if [ ! -d "${mysql_dbdir}/mysql" ]; then
> 		mysql_create_auth_tables || return 1
> 	fi
> 	if checkyesno mysql_limits; then
>diff -Naur mysql57-server/files/patch-CMakeLists.txt mysql57-server/files/patch-CMakeLists.txt
>--- mysql57-server/files/patch-CMakeLists.txt	2016-04-14 13:00:55.977468000 +0200
>+++ mysql57-server/files/patch-CMakeLists.txt	2016-04-14 14:08:52.789188000 +0200
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ CMakeLists.txt
>-@@ -577,12 +577,10 @@ IF(UNIX)
>+@@ -614,12 +614,10 @@ IF(UNIX)
>  ENDIF()
>  
>  IF(NOT WITHOUT_SERVER)
>@@ -13,7 +13,7 @@
>    ENDIF(WITH_EMBEDDED_SERVER)
>  ENDIF()
>  
>-@@ -591,8 +589,6 @@ ENDIF()
>+@@ -628,8 +626,6 @@ ENDIF()
>  ADD_SUBDIRECTORY(scripts)
>  
>  IF(NOT WITHOUT_SERVER)
>@@ -22,7 +22,7 @@
>    ADD_SUBDIRECTORY(support-files)
>    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
>      ADD_SUBDIRECTORY(internal)
>-@@ -647,6 +643,7 @@ ENDIF()
>+@@ -684,6 +680,7 @@ ENDIF()
>  #
>  # RPM installs documentation directly from the source tree
>  #
>@@ -30,7 +30,7 @@
>  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>    INSTALL(FILES COPYING LICENSE.mysql 
>    DESTINATION ${INSTALL_DOCREADMEDIR} 
>-@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>+@@ -706,6 +703,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>      PATTERN "sp-imp-spec.txt" EXCLUDE
>    )
>  ENDIF()
>diff -Naur mysql57-server/files/patch-client_CMakeLists.txt mysql57-server/files/patch-client_CMakeLists.txt
>--- mysql57-server/files/patch-client_CMakeLists.txt	2016-04-14 13:00:55.977542000 +0200
>+++ mysql57-server/files/patch-client_CMakeLists.txt	2016-04-14 14:08:52.789253000 +0200
>@@ -1,6 +1,6 @@
>---- client/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- client/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ client/CMakeLists.txt
>-@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
>+@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
>  
>  ## Subdirectory with common client code.
>  ADD_SUBDIRECTORY(base)
>@@ -9,8 +9,8 @@
>  
>  ## We will need libeay32.dll and ssleay32.dll when running client executables.
>  COPY_OPENSSL_DLLS(copy_openssl_client)
>-@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
>- ENDIF()
>+@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
>+ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
>  
>  ADD_DEFINITIONS(${SSL_DEFINES})
> +IF(FALSE)
>@@ -23,7 +23,7 @@
>  
>  IF(NOT WITHOUT_SERVER)
>    MYSQL_ADD_EXECUTABLE(mysql_upgrade
>-@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
>+@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
>  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
>  
>@@ -31,7 +31,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
>  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
>  
>-@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
>+@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
>  
>  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
>  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
>@@ -44,7 +44,7 @@
>  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
>  ADD_COMPILE_FLAGS(
>    mysqlbinlog.cc
>-@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
>+@@ -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)
>@@ -52,7 +52,7 @@
>  
>  MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
>  TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
>-@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
>+@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
>    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
>  ENDIF()
>  
>@@ -64,7 +64,7 @@
>  
>  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
>  IF(WIN32)
>-@@ -197,11 +203,6 @@ ENDIF(WIN32)
>+@@ -123,11 +129,6 @@ ENDIF(WIN32)
>  
>  SET_TARGET_PROPERTIES (
>    mysql_plugin
>diff -Naur mysql57-server/files/patch-cmake_plugin.cmake mysql57-server/files/patch-cmake_plugin.cmake
>--- mysql57-server/files/patch-cmake_plugin.cmake	2016-04-14 13:00:55.977616000 +0200
>+++ mysql57-server/files/patch-cmake_plugin.cmake	2016-04-14 14:08:52.789317000 +0200
>@@ -1,6 +1,6 @@
>---- cmake/plugin.cmake.orig	2015-11-29 19:16:24 UTC
>+--- cmake/plugin.cmake.orig	2016-03-28 18:06:12 UTC
> +++ cmake/plugin.cmake
>-@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)
>+@@ -237,9 +237,6 @@ MACRO(MYSQL_ADD_PLUGIN)
>      MYSQL_INSTALL_TARGETS(${target}
>        DESTINATION ${INSTALL_PLUGINDIR}
>        COMPONENT ${INSTALL_COMPONENT})
>diff -Naur mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h
>--- mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	2016-04-14 13:00:55.977689000 +0200
>+++ mysql57-server/files/patch-cmd-line-utils_libedit_chartype.h	2016-04-14 14:08:52.789384000 +0200
>@@ -1,4 +1,4 @@
>---- cmd-line-utils/libedit/chartype.h.orig	2015-11-29 19:16:24 UTC
>+--- cmd-line-utils/libedit/chartype.h.orig	2016-03-28 18:06:12 UTC
> +++ cmd-line-utils/libedit/chartype.h
> @@ -49,7 +49,7 @@
>    TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
>diff -Naur mysql57-server/files/patch-cmd-line-utils_libedit_vi.c mysql57-server/files/patch-cmd-line-utils_libedit_vi.c
>--- mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	2016-04-14 13:00:55.977780000 +0200
>+++ mysql57-server/files/patch-cmd-line-utils_libedit_vi.c	2016-04-14 14:08:52.789457000 +0200
>@@ -1,4 +1,4 @@
>---- cmd-line-utils/libedit/vi.c.orig	2015-11-29 19:16:24 UTC
>+--- cmd-line-utils/libedit/vi.c.orig	2016-03-28 18:06:12 UTC
> +++ cmd-line-utils/libedit/vi.c
> @@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
>   * NB: posix implies that we should enter insert mode, however
>diff -Naur mysql57-server/files/patch-include_CMakeLists.txt mysql57-server/files/patch-include_CMakeLists.txt
>--- mysql57-server/files/patch-include_CMakeLists.txt	2016-04-14 13:00:55.977869000 +0200
>+++ mysql57-server/files/patch-include_CMakeLists.txt	2016-04-14 14:08:52.789529000 +0200
>@@ -1,13 +1,16 @@
>---- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- include/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ include/CMakeLists.txt
>-@@ -68,11 +68,13 @@ SET(HEADERS 
>+@@ -69,14 +69,13 @@ SET(HEADERS 
>    ${HEADERS_GEN_CONFIGURE}
>  )
>  
>-+IF(FALSE) 
>- INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR})
>- INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development)
>- INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development 
>++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
>  )
>diff -Naur mysql57-server/files/patch-include_my__compare.h mysql57-server/files/patch-include_my__compare.h
>--- mysql57-server/files/patch-include_my__compare.h	2016-04-14 13:00:55.977956000 +0200
>+++ mysql57-server/files/patch-include_my__compare.h	2016-04-14 14:08:52.789600000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_compare.h.orig	2015-11-29 19:16:24 UTC
>+--- include/my_compare.h.orig	2016-03-28 18:06:12 UTC
> +++ include/my_compare.h
> @@ -40,7 +40,7 @@ extern "C" {
>    But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
>diff -Naur mysql57-server/files/patch-include_my__thread__os__id.h mysql57-server/files/patch-include_my__thread__os__id.h
>--- mysql57-server/files/patch-include_my__thread__os__id.h	2016-04-14 13:00:55.978044000 +0200
>+++ mysql57-server/files/patch-include_my__thread__os__id.h	2016-04-14 14:08:52.789672000 +0200
>@@ -1,4 +1,4 @@
>---- include/my_thread_os_id.h.orig	2015-11-29 19:16:24 UTC
>+--- include/my_thread_os_id.h.orig	2016-03-28 18:06:12 UTC
> +++ include/my_thread_os_id.h
> @@ -75,8 +75,12 @@ static inline my_thread_os_id_t my_threa
>    return pthread_getthreadid_np();
>diff -Naur mysql57-server/files/patch-include_myisam.h mysql57-server/files/patch-include_myisam.h
>--- mysql57-server/files/patch-include_myisam.h	2016-04-14 13:00:55.978150000 +0200
>+++ mysql57-server/files/patch-include_myisam.h	2016-04-14 14:08:52.789743000 +0200
>@@ -1,4 +1,4 @@
>---- include/myisam.h.orig	2015-11-29 19:16:24 UTC
>+--- include/myisam.h.orig	2016-03-28 18:06:12 UTC
> +++ include/myisam.h
> @@ -45,7 +45,7 @@ extern "C" {
>    The following defines can be increased if necessary.
>diff -Naur mysql57-server/files/patch-libmysql_CMakeLists.txt mysql57-server/files/patch-libmysql_CMakeLists.txt
>--- mysql57-server/files/patch-libmysql_CMakeLists.txt	2016-04-14 13:00:55.978237000 +0200
>+++ mysql57-server/files/patch-libmysql_CMakeLists.txt	2016-04-14 14:08:52.789815000 +0200
>@@ -1,4 +1,4 @@
>---- libmysql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- libmysql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ libmysql/CMakeLists.txt
> @@ -215,7 +215,7 @@ IF(WIN32)
>  ENDIF()
>diff -Naur mysql57-server/files/patch-libservices_CMakeLists.txt mysql57-server/files/patch-libservices_CMakeLists.txt
>--- mysql57-server/files/patch-libservices_CMakeLists.txt	2016-04-14 13:00:55.978414000 +0200
>+++ mysql57-server/files/patch-libservices_CMakeLists.txt	2016-04-14 14:08:52.789978000 +0200
>@@ -1,7 +1,7 @@
>---- libservices/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- libservices/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ libservices/CMakeLists.txt
>-@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES
>-   security_context_service.c)
>+@@ -35,4 +35,6 @@ SET(MYSQLSERVICES_SOURCES
>+   mysql_keyring_service.c)
>  
>  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
> +IF(FALSE)
>diff -Naur mysql57-server/files/patch-mysys__ssl_my__default.cc mysql57-server/files/patch-mysys__ssl_my__default.cc
>--- mysql57-server/files/patch-mysys__ssl_my__default.cc	2016-04-14 13:00:55.978482000 +0200
>+++ mysql57-server/files/patch-mysys__ssl_my__default.cc	2016-04-14 14:08:52.790053000 +0200
>@@ -1,4 +1,4 @@
>---- mysys_ssl/my_default.cc.orig	2015-11-29 19:16:24 UTC
>+--- mysys_ssl/my_default.cc.orig	2016-03-28 18:06:12 UTC
> +++ mysys_ssl/my_default.cc
> @@ -122,7 +122,7 @@ static my_bool is_login_file= FALSE;
>  
>diff -Naur mysql57-server/files/patch-plugin_password__validation_validate__password.cc mysql57-server/files/patch-plugin_password__validation_validate__password.cc
>--- mysql57-server/files/patch-plugin_password__validation_validate__password.cc	2016-04-14 13:00:55.978549000 +0200
>+++ mysql57-server/files/patch-plugin_password__validation_validate__password.cc	2016-04-14 14:08:52.790131000 +0200
>@@ -1,4 +1,4 @@
>---- plugin/password_validation/validate_password.cc.orig	2015-11-29 19:16:24 UTC
>+--- plugin/password_validation/validate_password.cc.orig	2016-03-28 18:06:12 UTC
> +++ plugin/password_validation/validate_password.cc
> @@ -18,6 +18,8 @@
>  #include <mysql/plugin_validate_password.h>
>diff -Naur mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt
>--- mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt	2016-04-14 14:08:52.791312000 +0200
>@@ -0,0 +1,20 @@
>+--- 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)
>diff -Naur mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
>--- mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ mysql57-server/files/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt	2016-04-14 14:08:52.791404000 +0200
>@@ -0,0 +1,18 @@
>+--- 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
>diff -Naur mysql57-server/files/patch-scripts_CMakeLists.txt mysql57-server/files/patch-scripts_CMakeLists.txt
>--- mysql57-server/files/patch-scripts_CMakeLists.txt	2016-04-14 13:00:55.978618000 +0200
>+++ mysql57-server/files/patch-scripts_CMakeLists.txt	2016-04-14 14:08:52.790204000 +0200
>@@ -1,4 +1,4 @@
>---- scripts/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- scripts/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ scripts/CMakeLists.txt
> @@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
>            GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
>diff -Naur mysql57-server/files/patch-sql_CMakeLists.txt mysql57-server/files/patch-sql_CMakeLists.txt
>--- mysql57-server/files/patch-sql_CMakeLists.txt	2016-04-14 13:00:55.978685000 +0200
>+++ mysql57-server/files/patch-sql_CMakeLists.txt	2016-04-14 14:08:52.790276000 +0200
>@@ -1,4 +1,4 @@
>---- sql/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- sql/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ sql/CMakeLists.txt
> @@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES(
>    ${ZLIB_INCLUDE_DIR}
>diff -Naur mysql57-server/files/patch-sql_conn__handler_socket__connection.cc mysql57-server/files/patch-sql_conn__handler_socket__connection.cc
>--- mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	2016-04-14 13:00:55.978751000 +0200
>+++ mysql57-server/files/patch-sql_conn__handler_socket__connection.cc	2016-04-14 14:08:52.790351000 +0200
>@@ -1,4 +1,4 @@
>---- sql/conn_handler/socket_connection.cc.orig	2015-11-29 19:16:24 UTC
>+--- sql/conn_handler/socket_connection.cc.orig	2016-03-28 18:06:12 UTC
> +++ sql/conn_handler/socket_connection.cc
> @@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
>      signal(SIGCHLD, SIG_DFL);
>diff -Naur mysql57-server/files/patch-sql_json__dom.h mysql57-server/files/patch-sql_json__dom.h
>--- mysql57-server/files/patch-sql_json__dom.h	2016-04-14 13:00:55.978820000 +0200
>+++ mysql57-server/files/patch-sql_json__dom.h	2016-04-14 14:08:52.790422000 +0200
>@@ -1,4 +1,4 @@
>---- sql/json_dom.h.orig	2015-11-29 19:16:24 UTC
>+--- sql/json_dom.h.orig	2016-03-28 18:06:12 UTC
> +++ sql/json_dom.h
> @@ -368,7 +368,7 @@ struct Json_key_comparator
>    Json_object class.
>diff -Naur mysql57-server/files/patch-sql_sql__view.cc mysql57-server/files/patch-sql_sql__view.cc
>--- mysql57-server/files/patch-sql_sql__view.cc	2016-04-14 13:00:55.978891000 +0200
>+++ mysql57-server/files/patch-sql_sql__view.cc	2016-04-14 14:08:52.790494000 +0200
>@@ -1,6 +1,6 @@
>---- sql/sql_view.cc.orig	2015-11-29 19:16:24 UTC
>+--- sql/sql_view.cc.orig	2016-03-28 18:06:12 UTC
> +++ sql/sql_view.cc
>-@@ -768,46 +768,46 @@ static const int required_view_parameter
>+@@ -773,46 +773,46 @@ static const int required_view_parameter
>  */
>  static File_option view_parameters[]=
>  {{{ C_STRING_WITH_LEN("query")},
>diff -Naur mysql57-server/files/patch-sql_sys__vars.cc mysql57-server/files/patch-sql_sys__vars.cc
>--- mysql57-server/files/patch-sql_sys__vars.cc	2016-04-14 13:00:55.978961000 +0200
>+++ mysql57-server/files/patch-sql_sys__vars.cc	2016-04-14 14:08:52.790582000 +0200
>@@ -1,4 +1,4 @@
>---- sql/sys_vars.cc.orig	2015-11-29 19:16:24 UTC
>+--- 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",
>@@ -9,7 +9,7 @@
>  
>  static Sys_var_ulong Sys_join_buffer_size(
>         "join_buffer_size",
>-@@ -2562,7 +2562,7 @@ static Sys_var_ulong Sys_net_read_timeou
>+@@ -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),
>@@ -18,7 +18,7 @@
>         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>         ON_UPDATE(fix_net_read_timeout));
>  
>-@@ -2578,7 +2578,7 @@ static Sys_var_ulong Sys_net_write_timeo
>+@@ -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),
>@@ -27,7 +27,7 @@
>         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
>         ON_UPDATE(fix_net_write_timeout));
>  
>-@@ -4031,7 +4031,7 @@ static Sys_var_ulong Sys_net_wait_timeou
>+@@ -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),
>diff -Naur mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc
>--- mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	2016-04-14 13:00:55.979031000 +0200
>+++ mysql57-server/files/patch-storage_innobase_buf_buf0buf.cc	2016-04-14 14:08:52.790668000 +0200
>@@ -1,6 +1,6 @@
>---- storage/innobase/buf/buf0buf.cc.orig	2015-11-29 19:16:24 UTC
>+--- storage/innobase/buf/buf0buf.cc.orig	2016-03-28 18:06:12 UTC
> +++ storage/innobase/buf/buf0buf.cc
>-@@ -300,7 +300,7 @@ typedef std::map<
>+@@ -338,7 +338,7 @@ typedef std::map<
>  	const byte*,
>  	buf_chunk_t*,
>  	std::less<const byte*>,
>diff -Naur mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc
>--- mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	2016-04-14 13:00:55.979119000 +0200
>+++ mysql57-server/files/patch-storage_innobase_dict_dict0stats.cc	2016-04-14 14:08:52.790757000 +0200
>@@ -1,4 +1,4 @@
>---- storage/innobase/dict/dict0stats.cc.orig	2015-11-29 19:16:24 UTC
>+--- storage/innobase/dict/dict0stats.cc.orig	2016-03-28 18:06:12 UTC
> +++ storage/innobase/dict/dict0stats.cc
> @@ -139,7 +139,7 @@ then we would store 5,7,10,11,12 in the 
>  typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> >	boundaries_t;
>diff -Naur mysql57-server/files/patch-storage_innobase_include_srv0mon.h mysql57-server/files/patch-storage_innobase_include_srv0mon.h
>--- mysql57-server/files/patch-storage_innobase_include_srv0mon.h	2016-04-14 13:00:55.979191000 +0200
>+++ mysql57-server/files/patch-storage_innobase_include_srv0mon.h	2016-04-14 14:08:52.790949000 +0200
>@@ -1,4 +1,4 @@
>---- storage/innobase/include/srv0mon.h.orig	2015-11-29 19:16:24 UTC
>+--- storage/innobase/include/srv0mon.h.orig	2016-03-28 18:06:12 UTC
> +++ storage/innobase/include/srv0mon.h
> @@ -34,6 +34,10 @@ Created 12/15/2009	Jimmy Yang
>  /* Required for FreeBSD so that INT64_MAX is defined. */
>diff -Naur mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc
>--- mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	2016-04-14 13:00:55.979261000 +0200
>+++ mysql57-server/files/patch-storage_innobase_sync_sync0debug.cc	2016-04-14 14:08:52.791037000 +0200
>@@ -1,6 +1,6 @@
>---- storage/innobase/sync/sync0debug.cc.orig	2015-11-29 19:16:24 UTC
>+--- storage/innobase/sync/sync0debug.cc.orig	2016-03-28 18:06:12 UTC
> +++ storage/innobase/sync/sync0debug.cc
>-@@ -1704,7 +1704,7 @@ private:
>+@@ -1702,7 +1702,7 @@ private:
>  		const void*,
>  		File,
>  		std::less<const void*>,
>diff -Naur mysql57-server/files/patch-storage_myisam_mi__dynrec.c mysql57-server/files/patch-storage_myisam_mi__dynrec.c
>--- mysql57-server/files/patch-storage_myisam_mi__dynrec.c	2016-04-14 13:00:55.979332000 +0200
>+++ mysql57-server/files/patch-storage_myisam_mi__dynrec.c	2016-04-14 14:08:52.791137000 +0200
>@@ -1,4 +1,4 @@
>---- storage/myisam/mi_dynrec.c.orig	2015-11-29 19:16:24 UTC
>+--- storage/myisam/mi_dynrec.c.orig	2016-03-28 18:06:12 UTC
> +++ storage/myisam/mi_dynrec.c
> @@ -65,18 +65,13 @@ my_bool mi_dynmap_file(MI_INFO *info, my
>      DBUG_RETURN(1);
>diff -Naur mysql57-server/files/patch-support-files_CMakeLists.txt mysql57-server/files/patch-support-files_CMakeLists.txt
>--- mysql57-server/files/patch-support-files_CMakeLists.txt	2016-04-14 13:00:55.979403000 +0200
>+++ mysql57-server/files/patch-support-files_CMakeLists.txt	2016-04-14 14:08:52.791224000 +0200
>@@ -1,4 +1,4 @@
>---- support-files/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
>+--- support-files/CMakeLists.txt.orig	2016-03-28 18:06:12 UTC
> +++ support-files/CMakeLists.txt
> @@ -69,7 +69,9 @@ IF(UNIX)
>      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
>@@ -7,6 +7,6 @@
> +IF(FALSE)
>    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
> +ENDIF()
>-   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
>    
>    SET(bindir ${prefix}/${INSTALL_BINDIR})
>+   SET(sbindir ${prefix}/${INSTALL_SBINDIR})
>diff -Naur mysql57-server/pkg-message mysql57-server/pkg-message
>--- mysql57-server/pkg-message	2016-04-14 13:00:55.979530000 +0200
>+++ mysql57-server/pkg-message	2016-04-14 20:56:25.646742000 +0200
>@@ -8,3 +8,13 @@
> in /root/.mysql_secret
> 
> *****************************************************************************
>+
>+*****************************************************************************
>+
>+Please keep in mind that the default location for my.cnf will be changed
>+from "/var/db/mysql/my.cnf" to "/usr/local/etc/mysql/my.cnf" in the near
>+future.  If you do not want to move your my.cnf to the new location then
>+you must set "mysql_optfile" in /etc/rc.conf to "/var/db/mysql/my.cnf".
>+
>+*****************************************************************************
>+
>diff -Naur mysql57-server/pkg-plist mysql57-server/pkg-plist
>--- mysql57-server/pkg-plist	2016-04-14 13:00:55.979599000 +0200
>+++ mysql57-server/pkg-plist	2016-04-14 14:08:52.791649000 +0200
>@@ -25,6 +25,7 @@
> lib/mysql/plugin/auth_test_plugin.so
> lib/mysql/plugin/daemon_example.ini
> %%NO_EXAMPLE%%lib/mysql/plugin/ha_example.so
>+lib/mysql/plugin/keyring_file.so
> lib/mysql/plugin/libdaemon_example.so
> lib/mysql/plugin/libtest_framework.so
> lib/mysql/plugin/libtest_services.so
>@@ -150,3 +151,7 @@
> %%DATADIR%%/swedish/errmsg.sys
> %%DATADIR%%/ukrainian/errmsg.sys
> %%DATADIR%%/uninstall_rewriter.sql
>+@sample(root,wheel,0640) %%ETCDIR%%/my.cnf.sample
>+@dir(mysql,mysql,0750) %%ETCDIR%%/keyring
>+@dir(mysql,mysql,0750) %%MY_SECDIR%%
>+@dir(mysql,mysql,0750) %%MY_TMPDIR%%

Actions: View | Diff

Attachments on bug 206998: 166699 | 166705 | 166778 | 166801 | 166802 | 166853 | 166996 | 166997 | 167010 | 167027 | 168565 | 168566 | 168567 | 168568 | 168570 | 168572 | 169320 | 169321 | 169324 | 169325 | 169343 | 169433 | 169437 | 169592 | 169598 | 169982 | 169994 | 170041