mysql57: updated to 5.7.28

Changes in MySQL 5.7.28

Configuration Notes

It is now possible to compile MySQL 5.7 using OpenSSL 1.1.1, enabling compilation support for MySQL 5.7 against OpenSSL even when OpenSSL 1.0.2 reaches End of Life status at the end of 2019.

All MySQL 5.7 builds now use OpenSSL. MySQL no longer supports using yaSSL as the SSL library, and source distributions no longer include yaSSL.

The WITH_SSL CMake option no longer permits bundled (use yaSSL) as a valid value, and the default option value has changed from bundled to system (use the version of OpenSSL installed on the host system).

sys Schema Notes

The sys.schema_unused_indexes view now filters out unique indexes.

The sys.ps_is_consumer_enabled() function now produces an error rather than returning NULL if the argument is an unknown non-NULL consumer name.

Previously, sys schema sources were maintained in a separate Git repository. sys schema sources now are included with and maintained within MySQL source distributions (under scripts/sys_schema).

The sys.version view is deprecated and will be removed in a future MySQL version. Affected applications should be adjusted to use an alternative instead. For example, use the VERSION() function to retrieve the MySQL server version.


Bugs Fixed

InnoDB: An ALTER TABLE ... ENCRYPTION = 'Y' operation on a MyISAM table failed to raise an error indicating that the storage engine does not support encryption. The INPLACE algorithm did not check encryption support before updating metadata in the .frm file. To address this issue, an encryption support flag was added. The ALTER TABLE ... ENCRYPTION = 'Y' operation now checks the flag and reports an error if the storage engine does not support encryption.

InnoDB: Delete marked rows were able to acquire an external read lock before a partial rollback was completed. The external read lock prevented conversion of an implicit lock to an explicit lock during the partial rollback, causing an assertion failure.

InnoDB: A long running ALTER TABLE ... ADD INDEX operation with concurrent inserts caused semaphore waits.

Replication: A deadlock involving three threads could occur if a START SLAVE statement was issued to start the SQL thread on a slave while the SQL thread was still in the process of being stopped, and a request for the slave status was made at the same time. The issue has now been fixed by releasing a lock earlier while the SQL thread is being stopped.

Replication: A locking issue in the WAIT_FOR_EXECUTED_GTID_SET() function could cause the server to hang in certain circumstances. The issue has now been corrected.

Replication: On a multi-threaded slave with GTIDs in use and MASTER_AUTO_POSITION set to ON, following an unexpected halt the slave would attempt relay log recovery, which failed if relay logs had been lost, preventing replication from starting. However, this step was unnecessary as GTID auto-positioning can be used to restore any missing transactions. In a recovery situation, the slave now checks first whether MASTER_AUTO_POSITION is set to ON, and if it is, skips relay log recovery.

When generating C source from SQL scripts, Some utf8-encoded characters were split across lines. Thanks to Przemysław Skibiński for the patch.

For Solaris, mysqld.cc contained a prototype for memcntl() that is no longer needed. The prototype has been removed.

For Solaris, -DWITH_SSL=system did not work when compiling with GCC.

MySQL builds configured with -DWITHOUT_SERVER=1 failed.

For the keyring_aws plugin, some valid region values for the keyring_aws_region system variable were rejected.

For debug builds, an assertion could be raised during UNION queries when computing the combined data type of a GEOMETRY column and SELECT * FROM (SELECT NULL).

For authentication using an LDAP authentication plugin, if the user DN portion was empty and group mapping was configured, authentication assigned an incorrect user DN and skipped the user search.

mysqlpump produced an error when run against a server older than MySQL 5.7.

A possible integer overflow due to unsigned integer type casting could lead to later buffer overflow due to arbitrary size memory allocation.

Attempted use of a freed object during MeCab plugin initialization caused a segmentation fault.

For MySQL installed using RPM packages, an initialization script that tested server connectivity misbehaved if the client account authenticated using an LDAP authentication plugin.

Improper locking during storage engine initialization could cause a server exit.

On a GTID-enabled server, concurrent execution of DROP USER and a prepared statement that accessed a view could deadlock.

A query with a WHERE clause whose predicate contained a numeric value in scientific notation was not handled correctly.

VS2019 produced compilation errors with debug compilation selected due to use of the /ZI flag. Now /Z7 is used instead.

The client library could dereference a null pointer while fetching result set metadata from the server.

In READ UNCOMMITTED isolation level, a segmentation fault occurred under heavy load from memcached clients. An externally stored BLOB column that was being updated by one transaction was read by another transaction as having a NULL value and a non-zero data length.

Arguments for the TIMESTAMPADD() function could be reversed for prepared statements.

With the thread_pool plugin enabled, the sys.processlist and sys.session views displayed a thread name rather than the actual user name.

The delete_latency column in the sys.schema_index_statistics view incorrectly referred to the SUM_TIMER_INSERT column of the Performance Schema table_io_waits_summary_by_index_usage table rather than the SUM_TIMER_DELETE column.

In output from the sys.diagnostics() procedure, the latency column for the user_summary_by_file_io_type view was incorrectly displayed in raw picoseconds rather than as a formatted value.

MySQL Enterprise Encryption functions could apply Diffie-Hellman (DH) methods to non-DH keys, resulting in unpredictable results or server exit.

Password masking was incomplete for SHOW PROCESSLIST and some INFORMATION_SCHEMA and Performance Schema tables.

The -DWITH_EXAMPLE_STORAGE_ENGINE=1 CMake option was ignored but should not have been. If -DWITH_EXAMPLE_STORAGE_ENGINE=0 is given, the EXAMPLE storage engine is built as a plugin.

8 files changed, 47 insertions, 47 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 7df56cbecc6..fbdf025928f 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2019/08/22 12:22:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2019/10/14 20:19:29 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
-PKGREVISION=	2
 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 be24a879622..58aac9aa3b7 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.20 2019/08/06 06:56:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2019/10/14 20:19:29 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.27
+DISTNAME=	mysql-5.7.28
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index f327cb94648..0bd5c87826e 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2019/08/06 06:56:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2019/10/14 20:19:29 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.14
+lib/libmysqlclient.so.20.3.15
 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 70b1fa83b58..0b904a48f2a 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.31 2019/08/06 06:56:43 adam Exp $
+$NetBSD: distinfo,v 1.32 2019/10/14 20:19:29 adam Exp $
 
-SHA1 (mysql-5.7.27.tar.gz) = 455e1de773ebc105c5d7888b17a84df741abdc6a
-RMD160 (mysql-5.7.27.tar.gz) = 5b3cb0ae9a0ebc2530b92be24550a360fbaa0572
-SHA512 (mysql-5.7.27.tar.gz) = 76c8cf7206af2342b30af288ac0c3397875c3bf8de6af08288096181078b9aaad539e3c67a0f4f919f184d68d4b2f2a62aa812899dfe6bea07d37cb08608a7d6
-Size (mysql-5.7.27.tar.gz) = 54398696 bytes
+SHA1 (mysql-5.7.28.tar.gz) = 93d5c460f32576c92f95d9d81938e1d15ece1ae4
+RMD160 (mysql-5.7.28.tar.gz) = 2ab8cddf7479aac8f5eaddd5a23cd4ee62b042d3
+SHA512 (mysql-5.7.28.tar.gz) = fa96cdf8d748a0cc12e01ddf8662e2ebd3a8e6474e38ec94f8c1bc1c6b590b9f60a95d91e7a9157ba2c06043b6cbe9426dc018e1fe33ec23ef8d1db7aa8ee0d6
+Size (mysql-5.7.28.tar.gz) = 54419008 bytes
 SHA1 (patch-CMakeLists.txt) = 1409a98380c999c6973fa3106dc35684b7c3b3cc
-SHA1 (patch-client_CMakeLists.txt) = 990d6df52380981f11a4ac5aafe48f34a3b2097f
+SHA1 (patch-client_CMakeLists.txt) = 4af2fb3f3d05a66a9ee89f3653e2fcccadfa5f79
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = ecf03b396c57c69e0d251497e7217e47632613c2
@@ -20,9 +20,9 @@ SHA1 (patch-include_my__compare.h) = f45bac4b488332a668b0005751856279b67401f5
 SHA1 (patch-include_my__global.h) = 3870266cb1dd2cd0d58417dfe21bab19b62100e2
 SHA1 (patch-include_my__thread.h) = 0f095acf94f8d130516dc4d858de1c64dd2bc127
 SHA1 (patch-include_my__thread__os__id.h) = a51861b791086a0eeb9cb4d64892c5033da8c8eb
-SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
+SHA1 (patch-libmysql_CMakeLists.txt) = 13b3aa65a82e0e94f097d0092e46b0b9558fdfc6
 SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
-SHA1 (patch-mysys__ssl_CMakeLists.txt) = 4750125b2e98d11c9efb653beda2d4d5166adc02
+SHA1 (patch-mysys__ssl_CMakeLists.txt) = 753c4f5ed1884e1a3c79d645af6d5ffd027ff7dd
 SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b
 SHA1 (patch-mysys_mf__iocache2.c) = 0c5047cbd4b9fc09d9e5b18bcae324d794fe833d
 SHA1 (patch-mysys_my__symlink.c) = 23b57cd5922357d0bc72f5c15100a9fe1f89cfb2
@@ -31,7 +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) = 69cebda59cdeb5f7d8ece4386a70ca38423e7707
+SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 65853fea39a88811cdd8af28ef3c659a0ccbc0e1
 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-client_CMakeLists.txt b/databases/mysql57-client/patches/patch-client_CMakeLists.txt
index b83c8e1cd0a..00e4867b3af 100644
--- a/databases/mysql57-client/patches/patch-client_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-client_CMakeLists.txt
@@ -1,10 +1,10 @@
-$NetBSD: patch-client_CMakeLists.txt,v 1.2 2018/01/16 16:29:42 adam Exp $
+$NetBSD: patch-client_CMakeLists.txt,v 1.3 2019/10/14 20:19:29 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 
---- client/CMakeLists.txt.orig	2017-12-28 03:46:26.000000000 +0000
+--- client/CMakeLists.txt.orig	2019-09-27 07:00:15.000000000 +0000
 +++ client/CMakeLists.txt
-@@ -32,8 +32,10 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+@@ -38,17 +38,21 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
  ## Subdirectory with common client code.
  ADD_SUBDIRECTORY(base)
@@ -13,9 +13,6 @@ Split configuration between mysql-client and mysql-server.
  ADD_SUBDIRECTORY(dump)
 +ENDIF()
  
- ## We will need libeay32.dll and ssleay32.dll when running client executables.
- COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -41,11 +43,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client)
  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -29,7 +26,7 @@ Split configuration between mysql-client and mysql-server.
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -58,14 +62,17 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
+@@ -61,14 +65,17 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
  ENDIF()
  
@@ -47,7 +44,7 @@ Split configuration between mysql-client and mysql-server.
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
  
-@@ -78,10 +85,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -81,10 +88,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -62,10 +59,10 @@ Split configuration between mysql-client and mysql-server.
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -98,9 +109,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -101,9 +112,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+ TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
 +ENDIF()
  
 +IF(NOT WITHOUT_SERVER)
@@ -75,7 +72,7 @@ Split configuration between mysql-client and mysql-server.
  
  IF(UNIX AND NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -113,23 +127,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -116,23 +130,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
diff --git a/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt b/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
index 26e4c3e0f60..16c882c65f7 100644
--- a/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
@@ -1,13 +1,13 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.3 2018/01/16 16:29:42 adam Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.4 2019/10/14 20:19:29 adam Exp $
 
 Do not install libmysqlclient with the server.
 Generate versioned lib symlinks on FreeBSD to supress PLIST divergence.
 authentication_ldap and libmysql_api_test require libmysqld.
 
---- libmysql/CMakeLists.txt.orig	2017-12-28 03:46:26.000000000 +0000
+--- libmysql/CMakeLists.txt.orig	2019-09-27 07:00:15.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -230,12 +230,13 @@ IF(WIN32)
-   LIST(APPEND LIBS auth_win_client)
+@@ -261,12 +261,13 @@ IF(WIN32)
+   LIST(APPEND LIBS_TO_MERGE auth_win_client)
  ENDIF()
  
 -# LDAP authentication SASL client plugin
@@ -16,26 +16,27 @@ authentication_ldap and libmysql_api_test require libmysqld.
    
  # Merge several convenience libraries into one big mysqlclient
 +IF(WITHOUT_SERVER)
- MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
 +ELSE()
-+MERGE_CONVENIENCE_LIBRARIES(mysqlclient SKIP_INSTALL ${LIBS} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(mysqlclient SKIP_INSTALL ${LIBS_TO_MERGE} COMPONENT Development)
 +ENDIF()
+ TARGET_LINK_LIBRARIES(mysqlclient ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
- IF(MSVC)
-@@ -269,12 +270,18 @@ ENDIF()
+@@ -310,13 +311,19 @@ ENDIF()
  IF(NOT DISABLE_SHARED)
    # Merge several convenience libraries into one big mysqlclient
    # and link them together into shared library.
 +  IF(WITHOUT_SERVER)
-   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
+   MERGE_LIBRARIES_SHARED(libmysql ${LIBS_TO_MERGE}
      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
      COMPONENT SharedLibraries)
 +  ELSE()
-+  MERGE_LIBRARIES_SHARED(libmysql SKIP_INSTALL ${LIBS}
++  MERGE_LIBRARIES_SHARED(libmysql SKIP_INSTALL ${LIBS_TO_MERGE}
 +    EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
 +    COMPONENT SharedLibraries)
 +  ENDIF()
+   TARGET_LINK_LIBRARIES(libmysql ${LIBS_TO_LINK})
    IF(UNIX)
      # libtool compatability
 -    IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -43,7 +44,7 @@ authentication_ldap and libmysql_api_test require libmysqld.
        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
      ELSE()
        SET(OS_SHARED_LIB_VERSION
-@@ -342,6 +349,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
+@@ -384,6 +391,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
  # from @CLIENT_API_FUNCTIONS@ are declared by <mysql.h>. It will fail
  # to run if not all of these symbols are exported by the library.
  #
@@ -51,7 +52,7 @@ authentication_ldap and libmysql_api_test require libmysqld.
  ADD_EXECUTABLE(libmysql_api_test ${CMAKE_CURRENT_BINARY_DIR}/api_test.c)
  SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
  IF(LIBRT)
-@@ -353,6 +361,7 @@ IF(DISABLE_SHARED)
+@@ -395,6 +403,7 @@ IF(DISABLE_SHARED)
  ELSE()
    TARGET_LINK_LIBRARIES(libmysql_api_test libmysql)
  ENDIF()
diff --git a/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt b/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
index 0118f300b18..d6417cdd686 100644
--- a/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-mysys__ssl_CMakeLists.txt
@@ -1,11 +1,14 @@
-$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.3 2018/06/14 13:13:35 jperkin Exp $
+$NetBSD: patch-mysys__ssl_CMakeLists.txt,v 1.4 2019/10/14 20:19:29 adam Exp $
 
 Fix build with newer DTrace, this module provides no probes.
 
---- mysys_ssl/CMakeLists.txt.orig	2018-03-04 13:40:40.000000000 +0000
+--- mysys_ssl/CMakeLists.txt.orig	2019-09-27 07:00:15.000000000 +0000
 +++ mysys_ssl/CMakeLists.txt
-@@ -48,4 +48,3 @@ TARGET_LINK_LIBRARIES(mysys_ssl dbug str
- IF(WIN32 AND NOT WITH_SSL STREQUAL "bundled")
+@@ -53,7 +53,6 @@ TARGET_LINK_LIBRARIES(mysys_ssl ${CMAKE_
+ IF(WIN32)
    TARGET_LINK_LIBRARIES(mysys_ssl crypt32)
  ENDIF()
 -DTRACE_INSTRUMENT(mysys_ssl)
+ 
+ # MD5_Init() MD5_Update() MD5_Final() are all deprecated
+ IF(SOLARIS AND CMAKE_COMPILER_IS_GNUCXX)
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 b9b134447d7..3c15dc1732a 100644
--- a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.5 2019/04/25 10:13:04 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.6 2019/10/14 20:19:29 adam Exp $
 
 Use system OpenSSL.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2019-04-13 13:32:15.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2019-09-27 07:00:15.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
-@@ -92,13 +92,13 @@ ELSE()
+@@ -99,13 +99,13 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
      ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
      ${CMAKE_CURRENT_BINARY_DIR}/generated
@@ -20,10 +20,10 @@ Fix mysqlxtest binary linking.
    )
  
    IF(XPLUGIN_NO_LITE_PROTOBUF)
-@@ -214,7 +214,10 @@ ELSE()
+@@ -221,7 +221,10 @@ ELSE()
    ENDIF()
  
-   TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
+   TARGET_LINK_LIBRARIES(mysqlxtest mysys strings ${FORCE_SSL_SOLARIS} mysqlclient)
 -  TARGET_LINK_LIBRARIES(mysqlxtest ${PROTOBUF_LIBRARY})
 +  TARGET_LINK_LIBRARIES(mysqlxtest ${PROTOBUF_LIBRARY} ${CRYPTO_LIBRARY})
 +  IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")