mysql57: updated to 5.7.22

Changes in MySQL 5.7.22:

Deprecation and Removal Notes
These compatibility SQL modes are now deprecated and will be removed in MySQL 8.0: DB2, MAXDB, MSSQL, MYSQL323, MYSQL40, ORACLE, POSTGRESQL, NO_FIELD_OPTIONS, NO_KEY_OPTIONS, NO_TABLE_OPTIONS. These deprecations have two implications:
Assigning a deprecated mode to the sql_mode system variable produces a warning.
With the MAXDB SQL mode enabled, using CREATE TABLE or ALTER TABLE to add a TIMESTAMP column to a table produces a warning.
Statements that use these deprecated SQL modes may fail when replicated from a MySQL 5.7 master to a MySQL 8.0 slave, or may have different effects on master and slave. To avoid such problems, applications that use the modes deprecated in MySQL 5.7 should be revised not to use them.

Test Suite Notes
Reduction of compiler and platform differences in GIS handling of floating-point results enables simplification of related test cases that no longer need rounding to avoid spurious test failures.

X Plugin Notes
X Plugin connection attempts using the X Protocol did not return an error when the default database specified in the connection options was invalid, and the connection was allowed with a null default database. Connection attempts using the classic MySQL protocol did return an error and disallowed the connection. X Protocol connection attempts now also disallow the connection if an invalid schema is specified.

Functionality Added or Changed
Replication: Changes introduced in version 8 which enable XCom to identify members using the concept of an incarnation have been merged in to version 5.7. These underlying changes add a UUID to members each time they join a group and this information can be used to distinguish among different member incarnations.
Replication: It is now possible to specify whether information written into the binary log enables replication slaves to parallelize based on commit timestamps, or on transaction write sets.
JSON: The JSON_MERGE() function is renamed to JSON_MERGE_PRESERVE().
JSON: Added the JSON utility function JSON_PRETTY(), which prints an existing JSON value, or any string that can successfully be parsed as a JSON document, in a format that can be easily read by humans. Each JSON object member or array value is displayed on a separate line of the output; each child object or array is intended 2 spaces with respect to its parent.

Bugs Fixed

8 files changed, 29 insertions, 49 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 01d5c4a2080..a3d29b97a9d 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2018/02/25 01:15:22 markd Exp $
+# $NetBSD: Makefile,v 1.14 2018/04/29 21:44:12 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (client)
 
 CONFLICTS=	mysql3-client-[0-9]*
diff --git a/databases/mysql57-client/Makefile.common b/databases/mysql57-client/Makefile.common
index 3234e3c06e1..8383130cbf1 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.10 2018/02/01 23:01:38 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.11 2018/04/29 21:44:12 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.21
+DISTNAME=	mysql-5.7.22
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index 40234439521..7ddc4c51d4f 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2018/01/16 16:29:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2018/04/29 21:44:12 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.8
+lib/libmysqlclient.so.20.3.9
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1
@@ -132,11 +132,8 @@ man/man1/myisam_ftdump.1
 man/man1/myisamchk.1
 man/man1/myisamlog.1
 man/man1/myisampack.1
-man/man1/mysql-stress-test.pl.1
-man/man1/mysql-test-run.pl.1
 man/man1/mysql.1
 man/man1/mysql.server.1
-man/man1/mysql_client_test.1
 man/man1/mysql_client_test_embedded.1
 man/man1/mysql_config.1
 man/man1/mysql_config_editor.1
@@ -158,7 +155,6 @@ man/man1/mysqlman.1
 man/man1/mysqlpump.1
 man/man1/mysqlshow.1
 man/man1/mysqlslap.1
-man/man1/mysqltest.1
 man/man1/mysqltest_embedded.1
 man/man1/perror.1
 man/man1/replace.1
diff --git a/databases/mysql57-client/distinfo b/databases/mysql57-client/distinfo
index 6735e675ac4..77eb82833a7 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.18 2018/02/25 01:15:22 markd Exp $
+$NetBSD: distinfo,v 1.19 2018/04/29 21:44:12 adam Exp $
 
-SHA1 (mysql-5.7.21.tar.gz) = 4ba0af75db7d5b33c30f20bdda2d059abc355a47
-RMD160 (mysql-5.7.21.tar.gz) = 7a70e573e4d9075bc62768f65509fe1c0e024a60
-SHA512 (mysql-5.7.21.tar.gz) = f10a5e3f5910dd9974ace0b87b10c1cbf4e8d47ba22f5382355f0bcfaa14cedb59b50a66ab0f6656842699690cb730bca0b1e11e61191546d5957b73fe8346c3
-Size (mysql-5.7.21.tar.gz) = 51822632 bytes
+SHA1 (mysql-5.7.22.tar.gz) = 734b98efa9f9691b056b9d788c7d936bc52bbde3
+RMD160 (mysql-5.7.22.tar.gz) = a0e7bcb650543c8b54579399f641430e338c76e2
+SHA512 (mysql-5.7.22.tar.gz) = 91df104493edac6a7b7e76ab1c8d465a6a5cba7552d2d0e2e0f58e3943a5ccdbcad9964f30c81d5d734d0dc988ef07f90215e91639014e51c8fba773855123d7
+Size (mysql-5.7.22.tar.gz) = 51868499 bytes
 SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
 SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
-SHA1 (patch-cmake_boost.cmake) = dc37e2cb58f5ae91c61f2e08825530649d32be6b
+SHA1 (patch-cmake_boost.cmake) = 5a6ad341e956178cc63195966529e0fceab31a6d
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
@@ -19,7 +19,6 @@ SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
 SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
 SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
 SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
-SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c
 SHA1 (patch-mysys__ssl_my__aes__openssl.cc) = 98881ab664bf674e6813ffc31f458a3e93c3fb3e
 SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
 SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2
@@ -29,8 +28,8 @@ SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_x
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__ssl__transport.c) = 5860b1b5511acf3fd6a2ce9f3ba58cfa45a06297
 SHA1 (patch-rapid_plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = d7f87bff5a41ff6a130fcf74dc520b38cedf5924
 SHA1 (patch-rapid_plugin_group__replication_rpcgen.cmake) = 5c14be97bd1fd04b2b845f1a2422452445733474
-SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = e2cc48b4d325060a105057bda715f4bd2fdab255
-SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = a531745be680ee06944678cfd35be10c653d1b17
+SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = aedf7d93889d4e7b4e04d182fe1a6775134f97e8
+SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = c0ae4570e138869a3203f7d4704a0b6b5c19e517
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = d66fe5fc8ac3a6230f1a3aa1395cf72e1a2b682e
diff --git a/databases/mysql57-client/patches/patch-cmake_boost.cmake b/databases/mysql57-client/patches/patch-cmake_boost.cmake
index 684c9054d05..b4a6dc864d5 100644
--- a/databases/mysql57-client/patches/patch-cmake_boost.cmake
+++ b/databases/mysql57-client/patches/patch-cmake_boost.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-cmake_boost.cmake,v 1.7 2018/01/01 21:18:18 adam Exp $
+$NetBSD: patch-cmake_boost.cmake,v 1.8 2018/04/29 21:44:12 adam Exp $
 
 Fix to use a newer version of Boost.
 
@@ -9,7 +9,7 @@ Fix to use a newer version of Boost.
  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  
 -# We want boost 1.59.0 in order to build our boost/geometry code.
-+# We want boost 1.66.0 in order to build our boost/geometry code.
++# We want boost 1.67.0 in order to build our boost/geometry code.
  # The boost tarball is fairly big, and takes several minutes
  # to download. So we recommend downloading/unpacking it
  # only once, in a place visible from any bzr sandbox.
@@ -18,11 +18,11 @@ Fix to use a newer version of Boost.
  # is installed on the compile host in the standard location.
  
 -SET(BOOST_PACKAGE_NAME "boost_1_59_0")
-+SET(BOOST_PACKAGE_NAME "boost_1_66_0")
++SET(BOOST_PACKAGE_NAME "boost_1_67_0")
  SET(BOOST_TARBALL "${BOOST_PACKAGE_NAME}.tar.gz")
  SET(BOOST_DOWNLOAD_URL
 -  "http://sourceforge.net/projects/boost/files/boost/1.59.0/${BOOST_TARBALL}"
-+  "http://sourceforge.net/projects/boost/files/boost/1.66.0/${BOOST_TARBALL}"
++  "http://sourceforge.net/projects/boost/files/boost/1.67.0/${BOOST_TARBALL}"
    )
  
  SET(OLD_PACKAGE_NAMES "boost_1_55_0 boost_1_56_0 boost_1_57_0 boost_1_58_0")
@@ -31,7 +31,7 @@ Fix to use a newer version of Boost.
  # //  BOOST_VERSION / 100 % 1000 is the minor version
  # //  BOOST_VERSION / 100000 is the major version
 -# #define BOOST_VERSION 105900
-+# #define BOOST_VERSION 106600
++# #define BOOST_VERSION 106700
  FILE(STRINGS "${BOOST_INCLUDE_DIR}/boost/version.hpp"
    BOOST_VERSION_NUMBER
    REGEX "^#define[\t ]+BOOST_VERSION[\t ][0-9]+.*"
@@ -40,10 +40,10 @@ Fix to use a newer version of Boost.
  ENDIF()
  
 -IF(NOT BOOST_MINOR_VERSION EQUAL 59)
-+IF(NOT BOOST_MINOR_VERSION EQUAL 66)
++IF(NOT BOOST_MINOR_VERSION EQUAL 67)
    MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
 -    "we need 59"
-+    "we need 66"
++    "we need 67"
      )
    COULD_NOT_FIND_BOOST()
  ENDIF()
diff --git a/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt b/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
deleted file mode 100644
index af572dead3e..00000000000
--- a/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
-
-Build with newer DTrace.
-
---- mysys_ssl/CMakeLists.txt.orig	2016-07-12 11:55:26.000000000 +0000
-+++ mysys_ssl/CMakeLists.txt
-@@ -48,7 +48,6 @@ TARGET_LINK_LIBRARIES(mysys_ssl dbug str
- IF(WIN32 AND NOT WITH_SSL STREQUAL "bundled")
-   TARGET_LINK_LIBRARIES(mysys_ssl crypt32)
- ENDIF()
--DTRACE_INSTRUMENT(mysys_ssl)
- 
- IF(MSVC)
-    INSTALL_DEBUG_TARGET(mysys_ssl DESTINATION ${INSTALL_LIBDIR}/debug)
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 f0265e426d4..723b9e15536 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.2 2017/04/11 20:49:15 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.3 2018/04/29 21:44:12 adam Exp $
 
 Use system OpenSSL and zlib.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2017-03-18 07:45:14.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2018-03-04 13:40:40.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
 @@ -92,14 +92,14 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
@@ -32,5 +32,5 @@ Fix mysqlxtest binary linking.
 +    TARGET_LINK_LIBRARIES(mysqlxtest "socket")
 +  ENDIF()
  
-   IF( WIN32 )
-     ADD_DEFINITIONS(-DMYSQLXTEST_EXPORTS)
+   IF(INSTALL_MYSQLTESTDIR)
+     INSTALL(
diff --git a/databases/mysql57-client/patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt b/databases/mysql57-client/patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
index e9f1d90169b..2b6e32bb31b 100644
--- a/databases/mysql57-client/patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_unittest_gunit_xplugin_CMakeLists.txt
@@ -1,18 +1,18 @@
-$NetBSD: patch-rapid_unittest_gunit_xplugin_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-rapid_unittest_gunit_xplugin_CMakeLists.txt,v 1.2 2018/04/29 21:44:12 adam Exp $
 
 Use bundled boost.
 
---- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2016-07-12 11:55:26.000000000 +0000
+--- rapid/unittest/gunit/xplugin/CMakeLists.txt.orig	2018-03-04 13:40:40.000000000 +0000
 +++ rapid/unittest/gunit/xplugin/CMakeLists.txt
-@@ -65,7 +65,6 @@ ENDIF()
- ADD_DEFINITIONS(${GMOCK_CFLAGS} -DBOOST_ALL_NO_LIB -DBOOST_NO_AUTO_PTR -DUSE_MYSQLX_FULL_PROTO -DXPLUGIN_UNIT_TESTS)
+@@ -69,7 +69,6 @@ ADD_DEFINITIONS(
+ )
  
  INCLUDE_DIRECTORIES(SYSTEM
 -    ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
      ${SSL_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIR}
-@@ -75,6 +74,7 @@ INCLUDE_DIRECTORIES(SYSTEM
+@@ -79,6 +78,7 @@ INCLUDE_DIRECTORIES(SYSTEM
  )
  
  INCLUDE_DIRECTORIES(