Date: Fri, 16 Nov 2018 17:17:34 +0000 (UTC) From: Mahdi Mokhtari <mmokhi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485092 - in branches/2018Q4/databases: mysql57-client/files mysql57-server mysql57-server/files Message-ID: <201811161717.wAGHHYK2019007@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmokhi Date: Fri Nov 16 17:17:34 2018 New Revision: 485092 URL: https://svnweb.freebsd.org/changeset/ports/485092 Log: MFH: r483359 databases/mysql57-{client, server}: Update to 5.7.24 Delete merged-to-upstream FreeBSD patches, edit half-merged ones. Upstream bugfixes: Regression of Bug #27753193 (segfault on ALTER TABLE adding primary key, InnoDB) Query interruption during a lock wait caused an error: Bug #28068293 Raised assertion during an OPTIMIZE TABLE operation for InnoDB: Bug #27753193 More info on update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-24.html PR: 232685 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: The FreeBSD Foundation Approved by: ports-secteam (feld) Added: branches/2018Q4/databases/mysql57-client/files/patch-mysys_mf__iocache2.c - copied unchanged from r483359, head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c Deleted: branches/2018Q4/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt Modified: branches/2018Q4/databases/mysql57-server/Makefile branches/2018Q4/databases/mysql57-server/distinfo branches/2018Q4/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt branches/2018Q4/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Directory Properties: branches/2018Q4/ (props changed) Copied: branches/2018Q4/databases/mysql57-client/files/patch-mysys_mf__iocache2.c (from r483359, head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/mysql57-client/files/patch-mysys_mf__iocache2.c Fri Nov 16 17:17:34 2018 (r485092, copy of r483359, head/databases/mysql57-client/files/patch-mysys_mf__iocache2.c) @@ -0,0 +1,10 @@ +--- mysys/mf_iocache2.c.orig 2018-10-28 11:22:04 UTC ++++ mysys/mf_iocache2.c +@@ -19,6 +19,7 @@ + + #include "mysys_priv.h" + #include "my_sys.h" ++#include "mysql/psi/mysql_file.h" + #include <m_string.h> + #include <stdarg.h> + #include <m_ctype.h> Modified: branches/2018Q4/databases/mysql57-server/Makefile ============================================================================== --- branches/2018Q4/databases/mysql57-server/Makefile Fri Nov 16 17:13:11 2018 (r485091) +++ branches/2018Q4/databases/mysql57-server/Makefile Fri Nov 16 17:17:34 2018 (r485092) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.7.23 -PORTREVISION?= 1 +PORTVERSION= 5.7.24 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= MYSQL/MySQL-5.7 PKGNAMESUFFIX?= 57-server Modified: branches/2018Q4/databases/mysql57-server/distinfo ============================================================================== --- branches/2018Q4/databases/mysql57-server/distinfo Fri Nov 16 17:13:11 2018 (r485091) +++ branches/2018Q4/databases/mysql57-server/distinfo Fri Nov 16 17:17:34 2018 (r485092) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533936896 -SHA256 (mysql-boost-5.7.23.tar.gz) = d05700ec5c1c6dae9311059dc1713206c29597f09dbd237bf0679b3c6438e87a -SIZE (mysql-boost-5.7.23.tar.gz) = 49025014 +TIMESTAMP = 1540720845 +SHA256 (mysql-boost-5.7.24.tar.gz) = b980dced9c9eb3385cca44870facc220504ca011196c5a19c2bfe43d3f5d6212 +SIZE (mysql-boost-5.7.24.tar.gz) = 49110448 Modified: branches/2018Q4/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Fri Nov 16 17:13:11 2018 (r485091) +++ branches/2018Q4/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt Fri Nov 16 17:17:34 2018 (r485092) @@ -1,18 +1,16 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2017-07-20 22:54:16 UTC +--- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-10-04 05:48:22 UTC +++ libmysql/authentication_ldap/CMakeLists.txt -@@ -52,8 +52,10 @@ ELSE () - SET(SASL_LIBRARY "sasl2") - ENDIF () +@@ -106,11 +106,13 @@ ELSE() + ENDIF() --MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -- auth_ldap_sasl_client.cc log_client.cc -- LINK_LIBRARIES ${SASL_LIBRARY} -- MODULE_ONLY -- MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") + MESSAGE(STATUS "SASL_LIBRARY = ${SASL_LIBRARY}") +IF (WITH_AUTHENTICATION_LDAP) -+ MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client -+ auth_ldap_sasl_client.cc log_client.cc -+ LINK_LIBRARIES ${SASL_LIBRARY} -+ MODULE_ONLY -+ MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") -+ENDIF() + MYSQL_ADD_PLUGIN(authentication_ldap_sasl_client + auth_ldap_sasl_client.cc log_client.cc + LINK_LIBRARIES ${SASL_LIBRARY} + CLIENT_ONLY MODULE_ONLY + MODULE_OUTPUT_NAME "authentication_ldap_sasl_client") ++ENDIF () + + IF(WIN32) + GET_FILENAME_COMPONENT(SASL_DLL_NAME ${SASL_LIBRARY_DLL} NAME) Modified: branches/2018Q4/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Fri Nov 16 17:13:11 2018 (r485091) +++ branches/2018Q4/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt Fri Nov 16 17:17:34 2018 (r485092) @@ -1,11 +1,10 @@ --- rapid/plugin/x/CMakeLists.txt.orig 2017-03-18 07:45:14 UTC +++ rapid/plugin/x/CMakeLists.txt -@@ -92,14 +92,14 @@ ELSE() +@@ -92,13 +92,14 @@ ELSE() ${CMAKE_SOURCE_DIR}/include #temporary ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql ${CMAKE_CURRENT_BINARY_DIR}/generated - ${SSL_INCLUDE_DIRS} -- ${ZLIB_INCLUDE_DIR} + ${BOOST_INCLUDE_DIR} )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811161717.wAGHHYK2019007>