diff options
| author | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-10-28 22:31:54 +0000 |
|---|---|---|
| committer | Mahdi Mokhtari <mmokhi@FreeBSD.org> | 2018-10-28 22:31:54 +0000 |
| commit | 61e60d6d528f89556b5e975976ce96e4342d23ee (patch) | |
| tree | e52facf7517bad01d1bfee9ba450a404375c6f7f /databases | |
| parent | biology/iqtree: Update to version 1.6.8 (diff) | |
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
Diffstat (limited to 'databases')
6 files changed, 29 insertions, 33 deletions
diff --git a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt deleted file mode 100644 index 843885b37cc7..000000000000 --- a/databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- libmysql/authentication_ldap/CMakeLists.txt.orig 2018-03-04 13:40:40 UTC -+++ libmysql/authentication_ldap/CMakeLists.txt -@@ -54,7 +54,7 @@ ENDIF() - IF (CMAKE_SYSTEM_NAME MATCHES "SunOS") - SET(SASL_LIBRARY "sasl") - ELSEIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") -- SET(SASL_LIBRARY "-L/usr/local/lib -R/usr/local/lib -lsasl2") -+ SET(SASL_LIBRARY "-L/usr/local/lib -rpath /usr/local/lib -lsasl2") - ELSE() - SET(SASL_LIBRARY "sasl2") - ENDIF () diff --git a/databases/mysql57-client/files/patch-mysys_mf__iocache2.c b/databases/mysql57-client/files/patch-mysys_mf__iocache2.c new file mode 100644 index 000000000000..10663953a1d5 --- /dev/null +++ b/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> diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index e859d70e13df..fdcc3291d9cd 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -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 diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 5adbd9453991..ad7900f18157 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -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 diff --git a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt index 05783d914af4..d92c872a48e4 100644 --- a/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-libmysql_authentication__ldap_CMakeLists.txt @@ -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) diff --git a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt index 19823553d9c0..33f07991ec96 100644 --- a/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-rapid_plugin_x_CMakeLists.txt @@ -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} ) |