mysql57: updated to 5.7.26

mysql-5.7.26:
Unknown changes

5 files changed, 18 insertions, 19 deletions

diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index fc78bc80ade..d3ffca1f841 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.15 2019/02/05 20:19:55 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2019/04/25 10:13:04 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.25
+DISTNAME=	mysql-5.7.26
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index 3766a7aab6f..447bc4409ed 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/02/05 20:19:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/04/25 10:13:04 adam Exp $
 bin/mysql
 bin/mysql_client_test
 bin/mysql_config
@@ -122,7 +122,7 @@ include/mysql/typelib.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.20
-lib/libmysqlclient.so.20.3.12
+lib/libmysqlclient.so.20.3.13
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index 00e66d89efc..6f011ab7929 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2019/02/05 20:19:55 adam Exp $
+$NetBSD: distinfo,v 1.29 2019/04/25 10:13:04 adam Exp $
 
-SHA1 (mysql-5.7.25.tar.gz) = 78e0146050afaac9140fbfa9e49d802d02adf5b5
-RMD160 (mysql-5.7.25.tar.gz) = 080484d0d40999aa91a84cfa12069530cb79fb10
-SHA512 (mysql-5.7.25.tar.gz) = f80e14c20f6e0914a87985eacd6718349480c0ddce800998c82580e1857f50014c40fcaf7b73b2efdbdb6499cc4d8fb7a5a75ce42375f9c318fc55c5f0dc8f76
-Size (mysql-5.7.25.tar.gz) = 52063298 bytes
+SHA1 (mysql-5.7.26.tar.gz) = 06afaa471c4d17f00e0717467094027eeaff8ad5
+RMD160 (mysql-5.7.26.tar.gz) = 3ab0a5b4d6883af767869fa9d55a5c8fd9013121
+SHA512 (mysql-5.7.26.tar.gz) = 7bb03cd3f56ce4ef97d9d431f633b73044a2577903b2ba0872bc49773ecd268dbd72f1e6eb0165f7b08d0052e1ab4cfd9ecc4780a7ac87fb6ac33d150c511717
+Size (mysql-5.7.26.tar.gz) = 54056899 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
 SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
@@ -11,7 +11,7 @@ SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = cab30ebdff1e773d6970f541f96fce8ed51257f8
 SHA1 (patch-cmake_build__configurations_mysql__release.cmake) = 7a1fb8c686f187db8fd9d8ad203c1f764d6e55a6
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
-SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
+SHA1 (patch-cmake_plugin.cmake) = 4480438969e297f67890b1974a86fb88a23d28ed
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
 SHA1 (patch-cmd-line-utils_libedit_chartype.h) = 6b1453df648001ed1fc81190106e15872a69a04c
 SHA1 (patch-cmd-line-utils_libedit_vi.c) = 7c5ce1d07f650815d028e435a59e5d078ec74c2f
@@ -31,8 +31,7 @@ SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_s
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = 7077900830f904c74c79439b856d9d176fc27f15
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924
 SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = ff0679ed644d79abe52b208f6b60b5a4e480ed3f
-SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 4f548abab6917c2bedd970abdffe4e87c460667e
-SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517
+SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 69cebda59cdeb5f7d8ece4386a70ca38423e7707
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = 697add15adb66bf55cf561a6e43e0bf514d1e068
diff --git a/databases/mysql57-client/patches/patch-cmake_plugin.cmake b/databases/mysql57-client/patches/patch-cmake_plugin.cmake
index 8b7b41388e0..3646d38bd31 100644
--- a/databases/mysql57-client/patches/patch-cmake_plugin.cmake
+++ b/databases/mysql57-client/patches/patch-cmake_plugin.cmake
@@ -1,15 +1,15 @@
-$NetBSD: patch-cmake_plugin.cmake,v 1.2 2018/01/16 16:29:42 adam Exp $
+$NetBSD: patch-cmake_plugin.cmake,v 1.3 2019/04/25 10:13:04 adam Exp $
 
 Build with newer DTrace.
 
---- cmake/plugin.cmake.orig	2017-12-28 03:46:26.000000000 +0000
+--- cmake/plugin.cmake.orig	2019-04-13 13:32:15.000000000 +0000
 +++ cmake/plugin.cmake
 @@ -52,7 +52,7 @@ ENDMACRO()
  MACRO(MYSQL_ADD_PLUGIN)
    MYSQL_PARSE_ARGUMENTS(ARG
      "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
--    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY"
-+    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED;TEST_ONLY"
+-    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY;SKIP_INSTALL"
++    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY;SKIP_INSTALL;DTRACE_INSTRUMENTED"
      ${ARGN}
    )
    
diff --git a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
index 0cd94250ee3..b9b134447d7 100644
--- a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,9 +1,9 @@
-$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.4 2018/11/22 16:14:53 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.5 2019/04/25 10:13:04 adam Exp $
 
 Use system OpenSSL.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2018-10-04 05:48:22.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2019-04-13 13:32:15.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
 @@ -92,13 +92,13 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
@@ -15,7 +15,7 @@ Fix mysqlxtest binary linking.
    INCLUDE_DIRECTORIES(SYSTEM
      ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
-     ${LIBEVENT_INCLUDE_DIR}
+     ${LIBEVENT_INCLUDE_DIRS}
 +    ${SSL_INCLUDE_DIRS}
    )