Attachment 166997 Details for Bug 206998 – patch updates mysql to 5.7.11, depends on my prev patch

[patch] patch updates mysql to 5.7.11, depends on my prev patch

mysql57-update.diff (text/plain), 12.93 KB, created by Markus Kohlmeyer on 2016-02-14 21:29:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-02-14 21:29:48 UTC

Size: 12.93 KB

patch

obsolete

>diff -Naur mysql57-client/files/patch-CMakeLists.txt mysql57-client/files/patch-CMakeLists.txt
>--- mysql57-client/files/patch-CMakeLists.txt	2016-02-14 22:01:26.961497000 +0100
>+++ mysql57-client/files/patch-CMakeLists.txt	2016-02-14 21:35:20.837706000 +0100
>@@ -1,6 +1,6 @@
> --- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
> +++ CMakeLists.txt
>-@@ -569,8 +569,8 @@ ENDIF()
>+@@ -579,8 +579,8 @@ ENDIF()
>  
>  ADD_SUBDIRECTORY(extra)
>  ADD_SUBDIRECTORY(client)
>@@ -10,7 +10,7 @@
>  
>  IF(UNIX)
>    ADD_SUBDIRECTORY(man)
>-@@ -639,14 +639,13 @@ ELSE()
>+@@ -653,14 +653,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")
>+@@ -683,6 +682,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
>      PATTERN "sp-imp-spec.txt" EXCLUDE
>    )
>  ENDIF()
>diff -Naur mysql57-client/files/patch-client_CMakeLists.txt mysql57-client/files/patch-client_CMakeLists.txt
>--- mysql57-client/files/patch-client_CMakeLists.txt	2016-02-14 22:01:26.961531000 +0100
>+++ mysql57-client/files/patch-client_CMakeLists.txt	2016-02-14 21:35:20.837940000 +0100
>@@ -1,6 +1,6 @@
> --- client/CMakeLists.txt.orig	2015-11-29 19:16:24 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/files/patch-include_CMakeLists.txt mysql57-client/files/patch-include_CMakeLists.txt
>--- mysql57-client/files/patch-include_CMakeLists.txt	2016-02-14 22:01:26.961753000 +0100
>+++ mysql57-client/files/patch-include_CMakeLists.txt	2016-02-14 21:35:20.838100000 +0100
>@@ -1,6 +1,6 @@
> --- include/CMakeLists.txt.orig	2015-11-29 19:16:24 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/pkg-plist mysql57-client/pkg-plist
>--- mysql57-client/pkg-plist	2016-02-14 22:01:26.962110000 +0100
>+++ mysql57-client/pkg-plist	2016-02-14 21:35:20.838280000 +0100
>@@ -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-02-14 22:16:27.037793000 +0100
>+++ mysql57-server/Makefile	2016-02-14 21:49:34.806858000 +0100
>@@ -2,12 +2,12 @@
> # $FreeBSD: head/databases/mysql57-server/Makefile 408349 2016-02-07 08:08:20Z riggs $
> 
> PORTNAME=	mysql
>-PORTVERSION=	5.7.10
>-PORTREVISION?=	5
>+PORTVERSION=	5.7.11
> 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)
>@@ -29,7 +29,8 @@
> BUNDLED_ZLIB_DESC=	Use bundled zlib
> SYSTEM_ZLIB_DESC=	Use system zlib
> 
>-CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
>+CMAKE_ARGS+=	-DINSTALL_LAYOUT=STANDALONE \
>+		-DINSTALL_DOCDIR="share/doc/mysql" \
> 		-DINSTALL_DOCREADMEDIR="share/doc/mysql" \
> 		-DINSTALL_INCLUDEDIR="include/mysql" \
> 		-DINSTALL_INFODIR="info" \
>@@ -44,9 +45,8 @@
> 		-DINSTALL_SCRIPTDIR="bin" \
> 		-DINSTALL_SHAREDIR="share" \
> 		-DINSTALL_SUPPORTFILESDIR="share/mysql" \
>-		-DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \
>-		-DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \
> 		-DWITH_INNODB_EXTRA_DEBUG=0 \
>+		-DWITH_BOOST=${WRKSRC}/boost \
> 		-DWITH_LIBEVENT=system
> 
> SHEBANG_FILES=	scripts/*.pl* scripts/*.sh
>diff -Naur mysql57-server/distinfo mysql57-server/distinfo
>--- mysql57-server/distinfo	2016-02-14 22:01:26.962237000 +0100
>+++ mysql57-server/distinfo	2016-02-14 21:35:54.769406000 +0100
>@@ -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.11.tar.gz) = ab21347ba004a5aa349b911d829a14e79b1e36e4bcd007d39d75212071414e28
>+SIZE (mysql-boost-5.7.11.tar.gz) = 59225677
>diff -Naur mysql57-server/files/patch-CMakeLists.txt mysql57-server/files/patch-CMakeLists.txt
>--- mysql57-server/files/patch-CMakeLists.txt	2016-02-14 22:01:26.962436000 +0100
>+++ mysql57-server/files/patch-CMakeLists.txt	2016-02-14 21:35:54.769591000 +0100
>@@ -1,6 +1,6 @@
> --- CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
> +++ CMakeLists.txt
>-@@ -577,12 +577,10 @@ IF(UNIX)
>+@@ -587,12 +587,10 @@ IF(UNIX)
>  ENDIF()
>  
>  IF(NOT WITHOUT_SERVER)
>@@ -13,7 +13,7 @@
>    ENDIF(WITH_EMBEDDED_SERVER)
>  ENDIF()
>  
>-@@ -591,8 +589,6 @@ ENDIF()
>+@@ -601,8 +599,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()
>+@@ -661,6 +657,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")
>+@@ -683,6 +680,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-02-14 22:01:26.962470000 +0100
>+++ mysql57-server/files/patch-client_CMakeLists.txt	2016-02-14 21:35:54.769820000 +0100
>@@ -1,6 +1,6 @@
> --- client/CMakeLists.txt.orig	2015-11-29 19:16:24 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-include_CMakeLists.txt mysql57-server/files/patch-include_CMakeLists.txt
>--- mysql57-server/files/patch-include_CMakeLists.txt	2016-02-14 22:01:26.962606000 +0100
>+++ mysql57-server/files/patch-include_CMakeLists.txt	2016-02-14 21:35:54.769980000 +0100
>@@ -1,12 +1,14 @@
> --- include/CMakeLists.txt.orig	2015-11-29 19:16:24 UTC
> +++ include/CMakeLists.txt
>-@@ -69,10 +69,12 @@ SET(HEADERS 
>+@@ -69,6 +69,7 @@ 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 
>+ INSTALL(FILES
>+   ../libbinlogevents/export/binary_log_types.h
>+   DESTINATION ${INSTALL_INCLUDEDIR}
>+@@ -78,5 +79,6 @@ INSTALL(DIRECTORY mysql/ DESTINATION ${I
>   PATTERN "*.h"
>   PATTERN "psi_abi*" EXCLUDE
>  )
>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-02-14 22:01:26.963061000 +0100
>+++ mysql57-server/files/patch-sql_sys__vars.cc	2016-02-14 21:35:54.770167000 +0100
>@@ -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
>+@@ -2568,7 +2568,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
>+@@ -2584,7 +2584,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
>+@@ -4034,7 +4034,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/pkg-plist mysql57-server/pkg-plist
>--- mysql57-server/pkg-plist	2016-02-14 22:01:26.963261000 +0100
>+++ mysql57-server/pkg-plist	2016-02-14 21:35:54.770337000 +0100
>@@ -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

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