From 61e60d6d528f89556b5e975976ce96e4342d23ee Mon Sep 17 00:00:00 2001 From: Mahdi Mokhtari Date: Sun, 28 Oct 2018 22:31:54 +0000 Subject: 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 Sponsored by: The FreeBSD Foundation --- .../files/patch-libmysql_authentication__ldap_CMakeLists.txt | 11 ----------- databases/mysql57-client/files/patch-mysys_mf__iocache2.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 databases/mysql57-client/files/patch-libmysql_authentication__ldap_CMakeLists.txt create mode 100644 databases/mysql57-client/files/patch-mysys_mf__iocache2.c (limited to 'databases/mysql57-client/files') 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 + #include + #include -- cgit v1.2.3