pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/databases



Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Jan 16 16:29:42 UTC 2018

Modified Files:
        pkgsrc/databases/mysql57-client: Makefile Makefile.common PLIST
            distinfo
        pkgsrc/databases/mysql57-client/patches: patch-client_CMakeLists.txt
            patch-cmake_plugin.cmake patch-libmysql_CMakeLists.txt
        pkgsrc/databases/mysql57-server: Makefile PLIST
Removed Files:
        pkgsrc/databases/mysql57-client/patches: patch-cmake_libutils.cmake

Log Message:
mysql57: updated to 5.7.21

MySQL 5.7.21

Audit Log Notes
* MySQL Enterprise Audit now supports compression and encryption of audit log files. Encryption is based on a user-defined password. To use this feature, the MySQL keyring must be enabled because 
audit logging uses it for password storage. MySQL Enterprise Audit also now supports logging in JSON format, in addition to the existing XML formats. For JSON format, functions are available that 
provide runtime log reading capabilities. For additional information, see MySQL Enterprise Audit.

Configuration Notes
* For RHEL, SLES, and Fedora RPMs, the default plugin directory for debug builds has been changed from /usr/lib64/mysql/plugin to /usr/lib64/mysql/plugin/debug.
* The installation scripts for MySQL Enterprise Audit and MySQL Enterprise Firewall now create their associated tables in the mysql system database as InnoDB rather than MyISAM tables.
* The hardcoded memory page size of 8KB for the memory-mapped transaction coordinator was too small for platforms such as ARM64 and PowerPC where the page size is much larger. The server now invokes 
a system call to get the page size of the current platform rather than using a hardcoded value. A consequence for the --log-tc-size option is that the minimum and default values are now 6 times the 
page size. Also, the value must be a multiple of the page size. Thanks to Alexey Kopytov for the patch.

Performance Schema Notes
* The Performance Schema setup_timers table is now deprecated, to be removed in MySQL 8.0, as is the TICK row in the performance_timers table.

Pluggable Authentication
* For the LDAP authentication plugins, handling of the group search attribute indicated by the authentication_ldap_sasl_group_search_attr and authentication_ldap_simple_group_search_attr system 
variables is more flexible. If the group search attribute is isMemberOf, LDAP authentication directly retrieves the user attribute isMemberOf value and assign it as group information. If the group 
search attribute is not isMemberOf, LDAP authentication searches for all groups where the user is a member. (The latter is the default behavior.) This behavior is based on how LDAP group information 
can be stored two ways: 1) A group entry can have an attribute named memberUid or member with a value that is a user name; 2) A user entry can have an attribute named isMemberOf with values that are 
group names.
* The LDAP authentication plugins now permit the authentication string that provides user DN information to begin with a + character. In the absence of this character, the authentication string value 
is treated as is without modification, as it has been previously. If the authentication string begins with +, the plugin constructs the full user DN value from the account user name as the cn 
attribute value, together with the authentication string (with the + removed). The authentication string is stored as given in the mysql.user system table, with the full user DN constructed on the 
fly before authentication.
* For the LDAP authentication plugins, the group search attribute was fixed and not configurable. Two new system variables now enable using custom group filters: 
authentication_ldap_sasl_group_search_filter and authentication_ldap_simple_group_search_filter.

Security Notes
* Incompatible Change: Passwords are now restricted to a maximum of 256 characters for the sha256_password authentication plugin, and for the PASSWORD() function when old_passwords=2. Also, the 
number of password hashing rounds is capped to limit CPU time used.
* The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2n. Issues fixed in the new OpenSSL version are described at 
http://www.openssl.org/news/vulnerabilities.html.
* This change does not affect the Oracle-produced MySQL Community build of MySQL Server, which uses the yaSSL library instead.
* MySQL now supports key migration between underlying keyring keystores. This enables DBAs to switch a MySQL installation from one keyring plugin to another. See Migrating Keys Between Keyring 
Keystores.
* MySQL Enterprise Edition now includes a keyring plugin, keyring_encrypted_file, that is similar to the keyring_file plugin in its use of a local data file for key storage, but that also encrypts 
the file based on a user-defined password. See Using the keyring_encrypted_file Keyring Plugin.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mysql57-client/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/mysql57-client/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mysql57-client/PLIST
cvs rdiff -u -r1.16 -r1.17 pkgsrc/databases/mysql57-client/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/databases/mysql57-client/patches/patch-cmake_libutils.cmake
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mysql57-server/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/mysql57-server/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/mysql57-client/Makefile
diff -u pkgsrc/databases/mysql57-client/Makefile:1.11 pkgsrc/databases/mysql57-client/Makefile:1.12
--- pkgsrc/databases/mysql57-client/Makefile:1.11       Mon Jan  1 21:18:18 2018
+++ pkgsrc/databases/mysql57-client/Makefile    Tue Jan 16 16:29:41 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2018/01/01 21:18:18 adam Exp $
+# $NetBSD: Makefile,v 1.12 2018/01/16 16:29:41 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-client-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (client)
 
 CONFLICTS=     mysql3-client-[0-9]*

Index: pkgsrc/databases/mysql57-client/Makefile.common
diff -u pkgsrc/databases/mysql57-client/Makefile.common:1.8 pkgsrc/databases/mysql57-client/Makefile.common:1.9
--- pkgsrc/databases/mysql57-client/Makefile.common:1.8 Sun Oct 22 20:20:57 2017
+++ pkgsrc/databases/mysql57-client/Makefile.common     Tue Jan 16 16:29:41 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.8 2017/10/22 20:20:57 adam Exp $
+# $NetBSD: Makefile.common,v 1.9 2018/01/16 16:29:41 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=      mysql-5.7.20
+DISTNAME=      mysql-5.7.21
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
@@ -11,8 +11,8 @@ MAINTAINER?=  pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.mysql.com/
 LICENSE=       gnu-gpl-v2
 
-DISTINFO_FILE?=                ${.CURDIR}/../../databases/mysql57-client/distinfo
-PATCHDIR?=             ${.CURDIR}/../../databases/mysql57-client/patches
+DISTINFO_FILE?=        ${.CURDIR}/../../databases/mysql57-client/distinfo
+PATCHDIR?=     ${.CURDIR}/../../databases/mysql57-client/patches
 
 USE_CMAKE=             yes
 USE_LANGUAGES=         c c++

Index: pkgsrc/databases/mysql57-client/PLIST
diff -u pkgsrc/databases/mysql57-client/PLIST:1.6 pkgsrc/databases/mysql57-client/PLIST:1.7
--- pkgsrc/databases/mysql57-client/PLIST:1.6   Sun Oct 22 20:20:57 2017
+++ pkgsrc/databases/mysql57-client/PLIST       Tue Jan 16 16:29:41 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/10/22 20:20:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/16 16:29:41 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.7
+lib/libmysqlclient.so.20.3.8
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/innochecksum.1

Index: pkgsrc/databases/mysql57-client/distinfo
diff -u pkgsrc/databases/mysql57-client/distinfo:1.16 pkgsrc/databases/mysql57-client/distinfo:1.17
--- pkgsrc/databases/mysql57-client/distinfo:1.16       Mon Jan  1 21:18:18 2018
+++ pkgsrc/databases/mysql57-client/distinfo    Tue Jan 16 16:29:41 2018
@@ -1,24 +1,23 @@
-$NetBSD: distinfo,v 1.16 2018/01/01 21:18:18 adam Exp $
+$NetBSD: distinfo,v 1.17 2018/01/16 16:29:41 adam Exp $
 
-SHA1 (mysql-5.7.20.tar.gz) = 567061d786d89fe65cb6fb70d0e70e36278e9ef2
-RMD160 (mysql-5.7.20.tar.gz) = ac32cc6809c378ce795f8bc89422868a4702b290
-SHA512 (mysql-5.7.20.tar.gz) = 130f8fd7afffd807e52fae47765c6bcdcae7f81448dfd2f7f6ce7108b4c8ddb1d190d17d72eb2c3a774cbc74db93a50942fc7ca079211437b17ab58000ccf11f
-Size (mysql-5.7.20.tar.gz) = 51725558 bytes
+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 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
-SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
+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_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
 SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
-SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
+SHA1 (patch-cmake_plugin.cmake) = 92267182d4ec559a312a5a38826b9047c99b122f
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
 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) = 00ce9c7f0e2c4132b872ffde05ee74e81c280f68
+SHA1 (patch-libmysql_CMakeLists.txt) = 306c73384226e07bf2a45af5d92b6f05d6044cbe
 SHA1 (patch-mysql-test_CMakeLists.txt) = 8a8e846792077101a01731c4577c37161f70264d
 SHA1 (patch-mysys__ssl_CMakeLists.txt) = 7ec44642cd13c5477175a94a007354c583ca9c3c
 SHA1 (patch-mysys_kqueue__timers.c) = 836803e9c7353b813bc22a5b69cc263dea384c9b

Index: pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt
diff -u pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt:1.1 pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt:1.2
--- pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt:1.1     Fri Sep 16 06:49:11 2016
+++ pkgsrc/databases/mysql57-client/patches/patch-client_CMakeLists.txt Tue Jan 16 16:29:42 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-client_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-client_CMakeLists.txt,v 1.2 2018/01/16 16:29:42 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 
---- client/CMakeLists.txt.orig 2016-03-28 18:06:12.000000000 +0000
+--- client/CMakeLists.txt.orig 2017-12-28 03:46:26.000000000 +0000
 +++ client/CMakeLists.txt
 @@ -32,8 +32,10 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
  
@@ -29,7 +29,7 @@ Split configuration between mysql-client
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -58,16 +62,18 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
+@@ -58,14 +62,17 @@ TARGET_LINK_LIBRARIES(mysql_upgrade mysq
  ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
  ENDIF()
  
@@ -37,6 +37,7 @@ Split configuration between mysql-client
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ ADD_DEPENDENCIES(mysqltest GenError)
 +ENDIF()
  
  ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
@@ -45,11 +46,8 @@ Split configuration between mysql-client
 +IF(WITHOUT_SERVER)
  MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
--
- MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c)
- TARGET_LINK_LIBRARIES(mysqldump mysqlclient)
  
-@@ -77,10 +83,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
+@@ -78,10 +85,14 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
  
  MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
  TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
@@ -64,7 +62,7 @@ Split configuration between mysql-client
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  ADD_COMPILE_FLAGS(
    mysqlbinlog.cc
-@@ -97,9 +107,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -98,9 +109,12 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
  TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -77,7 +75,7 @@ Split configuration between mysql-client
  
  IF(UNIX AND NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_install_db
-@@ -112,23 +125,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -113,23 +127,30 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
  ENDIF()
  
Index: pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake
diff -u pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake:1.1 pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake:1.2
--- pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake:1.1        Fri Sep 16 06:49:11 2016
+++ pkgsrc/databases/mysql57-client/patches/patch-cmake_plugin.cmake    Tue Jan 16 16:29:42 2018
@@ -1,21 +1,21 @@
-$NetBSD: patch-cmake_plugin.cmake,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-cmake_plugin.cmake,v 1.2 2018/01/16 16:29:42 adam Exp $
 
 Build with newer DTrace.
 
---- cmake/plugin.cmake.orig    2016-08-25 11:52:06.000000000 +0000
+--- cmake/plugin.cmake.orig    2017-12-28 03:46:26.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;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;TEST_ONLY"
-+    "STORAGE_ENGINE;STATIC_ONLY;MODULE_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"
++    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;CLIENT_ONLY;MANDATORY;DEFAULT;DISABLED;NOT_FOR_EMBEDDED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED;TEST_ONLY"
      ${ARGN}
    )
    
-@@ -125,7 +125,9 @@ MACRO(MYSQL_ADD_PLUGIN)
-     SET_TARGET_PROPERTIES(${target}
-       PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER")
+@@ -146,7 +146,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+       -P ${CMAKE_BINARY_DIR}/archive_output_directory/lib_location_${target}.cmake
+       )
  
 -    DTRACE_INSTRUMENT(${target})
 +    IF(ARG_DTRACE_INSTRUMENTED)
@@ -24,7 +24,7 @@ Build with newer DTrace.
      ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
      IF(WITH_EMBEDDED_SERVER AND NOT ARG_NOT_FOR_EMBEDDED)
        # Embedded library should contain PIC code and be linkable
-@@ -133,7 +135,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -154,7 +156,9 @@ MACRO(MYSQL_ADD_PLUGIN)
        IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
          # Recompile some plugins for embedded
          ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
@@ -35,7 +35,7 @@ Build with newer DTrace.
          IF(ARG_RECOMPILE_FOR_EMBEDDED)
            SET_TARGET_PROPERTIES(${target}_embedded 
              PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER;EMBEDDED_LIBRARY")
-@@ -197,7 +201,9 @@ MACRO(MYSQL_ADD_PLUGIN)
+@@ -218,7 +222,9 @@ MACRO(MYSQL_ADD_PLUGIN)
  
      ADD_VERSION_INFO(${target} MODULE SOURCES)
      ADD_LIBRARY(${target} MODULE ${SOURCES}) 
@@ -45,4 +45,4 @@ Build with newer DTrace.
 +    ENDIF()
      SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
        COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
-     TARGET_LINK_LIBRARIES (${target} mysqlservices)
+     IF(NOT ARG_CLIENT_ONLY)

Index: pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt
diff -u pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.2 pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.3
--- pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt:1.2   Thu Jul 20 16:41:10 2017
+++ pkgsrc/databases/mysql57-client/patches/patch-libmysql_CMakeLists.txt       Tue Jan 16 16:29:42 2018
@@ -1,41 +1,38 @@
-$NetBSD: patch-libmysql_CMakeLists.txt,v 1.2 2017/07/20 16:41:10 adam Exp $
+$NetBSD: patch-libmysql_CMakeLists.txt,v 1.3 2018/01/16 16:29:42 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-06-22 14:13:19.000000000 +0000
+--- libmysql/CMakeLists.txt.orig       2017-12-28 03:46:26.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -230,12 +230,18 @@ IF(WIN32)
+@@ -230,12 +230,13 @@ IF(WIN32)
    LIST(APPEND LIBS auth_win_client)
  ENDIF()
  
-+IF(NOT WITHOUT_SERVER)
- # LDAP authentication SASL client plugin
- MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
+-# LDAP authentication SASL client plugin
+-MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
 -ADD_SUBDIRECTORY(authentication_ldap)
-+#ADD_SUBDIRECTORY(authentication_ldap)
-+ENDIF()
    
  # Merge several convenience libraries into one big mysqlclient
 +IF(WITHOUT_SERVER)
- MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
+ MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS} COMPONENT Development)
 +ELSE()
-+MERGE_LIBRARIES(mysqlclient STATIC NOINSTALL ${LIBS} COMPONENT Development)
++MERGE_CONVENIENCE_LIBRARIES(mysqlclient SKIP_INSTALL ${LIBS} COMPONENT Development)
 +ENDIF()
  
  # Visual Studio users need debug  static library for debug projects
  IF(MSVC)
-@@ -275,12 +281,18 @@ ENDIF()
+@@ -269,12 +270,18 @@ 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(libmysql SHARED ${LIBS}
+   MERGE_LIBRARIES_SHARED(libmysql ${LIBS}
      EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
      COMPONENT SharedLibraries)
 +  ELSE()
-+  MERGE_LIBRARIES(libmysql SHARED NOINSTALL ${LIBS}
++  MERGE_LIBRARIES_SHARED(libmysql SKIP_INSTALL ${LIBS}
 +    EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED}
 +    COMPONENT SharedLibraries)
 +  ENDIF()
@@ -46,7 +43,7 @@ authentication_ldap and libmysql_api_tes
        SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
      ELSE()
        SET(OS_SHARED_LIB_VERSION
-@@ -348,6 +360,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
+@@ -342,6 +349,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.
  #
@@ -54,9 +51,11 @@ authentication_ldap and libmysql_api_tes
  ADD_EXECUTABLE(libmysql_api_test ${CMAKE_CURRENT_BINARY_DIR}/api_test.c)
  SET_TARGET_PROPERTIES(libmysql_api_test PROPERTIES LINKER_LANGUAGE CXX)
  IF(LIBRT)
-@@ -359,4 +372,5 @@ IF(DISABLE_SHARED)
+@@ -353,6 +361,7 @@ IF(DISABLE_SHARED)
  ELSE()
    TARGET_LINK_LIBRARIES(libmysql_api_test libmysql)
  ENDIF()
 +ENDIF()
  
+ # Verify that libmysql_api_test runs OK
+ ADD_CUSTOM_COMMAND(TARGET libmysql_api_test POST_BUILD

Index: pkgsrc/databases/mysql57-server/Makefile
diff -u pkgsrc/databases/mysql57-server/Makefile:1.12 pkgsrc/databases/mysql57-server/Makefile:1.13
--- pkgsrc/databases/mysql57-server/Makefile:1.12       Mon Jan  1 21:18:18 2018
+++ pkgsrc/databases/mysql57-server/Makefile    Tue Jan 16 16:29:42 2018
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2018/01/01 21:18:18 adam Exp $
+# $NetBSD: Makefile,v 1.13 2018/01/16 16:29:42 adam Exp $
 
 PKGNAME=       ${DISTNAME:S/-/-server-/}
-PKGREVISION=   1
 COMMENT=       MySQL 5, a free SQL database (server)
 
 CONFLICTS=     mysql3-server-[0-9]*

Index: pkgsrc/databases/mysql57-server/PLIST
diff -u pkgsrc/databases/mysql57-server/PLIST:1.6 pkgsrc/databases/mysql57-server/PLIST:1.7
--- pkgsrc/databases/mysql57-server/PLIST:1.6   Sun Oct 22 20:20:57 2017
+++ pkgsrc/databases/mysql57-server/PLIST       Tue Jan 16 16:29:42 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2017/10/22 20:20:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2018/01/16 16:29:42 adam Exp $
 @pkgdir lib/mysql/plugin/debug
 bin/innochecksum
 bin/lz4_decompress
@@ -300,6 +300,7 @@ share/mysql/test/extra/rpl_tests/rpl_par
 share/mysql/test/extra/rpl_tests/rpl_parallel_load_innodb.test
 share/mysql/test/extra/rpl_tests/rpl_parallel_recovery_core.test
 share/mysql/test/extra/rpl_tests/rpl_partition.test
+share/mysql/test/extra/rpl_tests/rpl_perfschema_applier_xa_status.test
 share/mysql/test/extra/rpl_tests/rpl_record_compare.test
 share/mysql/test/extra/rpl_tests/rpl_relayrotate.test
 share/mysql/test/extra/rpl_tests/rpl_replication_observers_example_plugin_server_startup.inc
@@ -391,6 +392,7 @@ share/mysql/test/include/check_ipv4_mapp
 share/mysql/test/include/check_ipv6.inc
 share/mysql/test/include/check_key_reads.inc
 share/mysql/test/include/check_key_req.inc
+share/mysql/test/include/check_keys_after_migration.inc
 share/mysql/test/include/check_no_concurrent_insert.inc
 share/mysql/test/include/check_no_row_lock.inc
 share/mysql/test/include/check_plugin_dir.inc
@@ -482,6 +484,7 @@ share/mysql/test/include/freebsd.inc
 share/mysql/test/include/func_aes_block.inc
 share/mysql/test/include/func_in.inc
 share/mysql/test/include/function_defaults.inc
+share/mysql/test/include/generate_keys_before_migration.inc
 share/mysql/test/include/get_file_permissions.inc
 share/mysql/test/include/get_frm_info.inc
 share/mysql/test/include/get_handler_status_counts.inc
@@ -1582,6 +1585,7 @@ share/mysql/test/r/mysqlpump_concurrency
 share/mysql/test/r/mysqlpump_extended.result
 share/mysql/test/r/mysqlpump_filters.result
 share/mysql/test/r/mysqlpump_multi_thread.result
+share/mysql/test/r/mysqlpump_partial_bkp.result
 share/mysql/test/r/mysqlshow.result
 share/mysql/test/r/mysqlslap.result
 share/mysql/test/r/mysqltest.result
@@ -2031,6 +2035,9 @@ share/mysql/test/r/xml.result
 share/mysql/test/std_data/.mylogin.cnf
 share/mysql/test/std_data/14897.frm
 share/mysql/test/std_data/256kb.json
+share/mysql/test/std_data/41_decimal.MYD
+share/mysql/test/std_data/41_decimal.MYI
+share/mysql/test/std_data/41_decimal.frm
 share/mysql/test/std_data/55_temporal.MYD
 share/mysql/test/std_data/55_temporal.MYI
 share/mysql/test/std_data/55_temporal.frm
@@ -2511,6 +2518,7 @@ share/mysql/test/suite/binlog/r/binlog_x
 share/mysql/test/suite/binlog/r/binlog_xa_modify_gtid_executed_explicitly.result
 share/mysql/test/suite/binlog/r/binlog_xa_prepare_failure.result
 share/mysql/test/suite/binlog/r/binlog_xa_prepared_disconnect.result
+share/mysql/test/suite/binlog/r/binlog_xa_rollback_failure.result
 share/mysql/test/suite/binlog/r/binlog_xa_select_gtid_executed_explicitly_crash.result
 share/mysql/test/suite/binlog/r/binlog_xa_trx_gtid_response_packet.result
 share/mysql/test/suite/binlog/r/binlog_xa_trx_split_across_binlog.result
@@ -2726,6 +2734,7 @@ share/mysql/test/suite/binlog/t/binlog_x
 share/mysql/test/suite/binlog/t/binlog_xa_modify_gtid_executed_explicitly.test
 share/mysql/test/suite/binlog/t/binlog_xa_prepare_failure.test
 share/mysql/test/suite/binlog/t/binlog_xa_prepared_disconnect.test
+share/mysql/test/suite/binlog/t/binlog_xa_rollback_failure.test
 share/mysql/test/suite/binlog/t/binlog_xa_select_gtid_executed_explicitly_crash.test
 share/mysql/test/suite/binlog/t/binlog_xa_trx_gtid_response_packet-master.opt
 share/mysql/test/suite/binlog/t/binlog_xa_trx_gtid_response_packet.test
@@ -4175,6 +4184,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/r/gr_delayed_view_change_write_local_commit_donor_crash.result
 share/mysql/test/suite/group_replication/r/gr_delayed_view_change_write_to_binary_log.result
 share/mysql/test/suite/group_replication/r/gr_dependent_ddl_dml_same_server.result
+share/mysql/test/suite/group_replication/r/gr_disjoint_gtids_join_option_deprecation.result
 share/mysql/test/suite/group_replication/r/gr_disregard_nonunique_key.result
 share/mysql/test/suite/group_replication/r/gr_executed_sets_compatibility.result
 share/mysql/test/suite/group_replication/r/gr_filters.result
@@ -4270,6 +4280,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/r/gr_psi_keys.result
 share/mysql/test/suite/group_replication/r/gr_random_view_id_generator.result
 share/mysql/test/suite/group_replication/r/gr_range_partition_tables.result
+share/mysql/test/suite/group_replication/r/gr_reach_max_connections_during_start.result
 share/mysql/test/suite/group_replication/r/gr_read_committed_isolation.result
 share/mysql/test/suite/group_replication/r/gr_read_uncommitted_isolation.result
 share/mysql/test/suite/group_replication/r/gr_readmode_on_autostart.result
@@ -4328,6 +4339,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/r/gr_server_uuid_matches_group_name.result
 share/mysql/test/suite/group_replication/r/gr_server_uuid_matches_group_name_bootstrap.result
 share/mysql/test/suite/group_replication/r/gr_server_uuid_matches_group_name_non_bootstrap.result
+share/mysql/test/suite/group_replication/r/gr_server_uuid_matches_other_server_uuid.result
 share/mysql/test/suite/group_replication/r/gr_set_gtid_mode.result
 share/mysql/test/suite/group_replication/r/gr_set_gtid_next.result
 share/mysql/test/suite/group_replication/r/gr_set_gtid_next_rollback_on_certification.result
@@ -4368,7 +4380,9 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/r/gr_skip_performance_schema_dml.result
 share/mysql/test/suite/group_replication/r/gr_skip_view_change_event.result
 share/mysql/test/suite/group_replication/r/gr_skip_wait_for_view_modification.result
+share/mysql/test/suite/group_replication/r/gr_slave_max_allowed_packet_dependency.result
 share/mysql/test/suite/group_replication/r/gr_slow_member_garbage_collection.result
+share/mysql/test/suite/group_replication/r/gr_sql_service_failure.result
 share/mysql/test/suite/group_replication/r/gr_ssl.result
 share/mysql/test/suite/group_replication/r/gr_ssl_mode.result
 share/mysql/test/suite/group_replication/r/gr_ssl_mode_basic.result
@@ -4510,6 +4524,8 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/t/gr_delayed_view_change_write_to_binary_log-master.opt
 share/mysql/test/suite/group_replication/t/gr_delayed_view_change_write_to_binary_log.test
 share/mysql/test/suite/group_replication/t/gr_dependent_ddl_dml_same_server.test
+share/mysql/test/suite/group_replication/t/gr_disjoint_gtids_join_option_deprecation-master.opt
+share/mysql/test/suite/group_replication/t/gr_disjoint_gtids_join_option_deprecation.test
 share/mysql/test/suite/group_replication/t/gr_disregard_nonunique_key.test
 share/mysql/test/suite/group_replication/t/gr_executed_sets_compatibility.cnf
 share/mysql/test/suite/group_replication/t/gr_executed_sets_compatibility.test
@@ -4650,6 +4666,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/t/gr_random_view_id_generator.test
 share/mysql/test/suite/group_replication/t/gr_range_partition_tables.cnf
 share/mysql/test/suite/group_replication/t/gr_range_partition_tables.test
+share/mysql/test/suite/group_replication/t/gr_reach_max_connections_during_start.test
 share/mysql/test/suite/group_replication/t/gr_read_committed_isolation.test
 share/mysql/test/suite/group_replication/t/gr_read_uncommitted_isolation.test
 share/mysql/test/suite/group_replication/t/gr_readmode_on_autostart-slave.opt
@@ -4744,6 +4761,7 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/t/gr_server_uuid_matches_group_name_bootstrap.test
 share/mysql/test/suite/group_replication/t/gr_server_uuid_matches_group_name_non_bootstrap-slave.opt
 share/mysql/test/suite/group_replication/t/gr_server_uuid_matches_group_name_non_bootstrap.test
+share/mysql/test/suite/group_replication/t/gr_server_uuid_matches_other_server_uuid.test
 share/mysql/test/suite/group_replication/t/gr_set_gtid_mode.test
 share/mysql/test/suite/group_replication/t/gr_set_gtid_next.test
 share/mysql/test/suite/group_replication/t/gr_set_gtid_next_rollback_on_certification.test
@@ -4803,7 +4821,10 @@ share/mysql/test/suite/group_replication
 share/mysql/test/suite/group_replication/t/gr_skip_view_change_event.cnf
 share/mysql/test/suite/group_replication/t/gr_skip_view_change_event.test
 share/mysql/test/suite/group_replication/t/gr_skip_wait_for_view_modification.test
+share/mysql/test/suite/group_replication/t/gr_slave_max_allowed_packet_dependency.cnf
+share/mysql/test/suite/group_replication/t/gr_slave_max_allowed_packet_dependency.test
 share/mysql/test/suite/group_replication/t/gr_slow_member_garbage_collection.test
+share/mysql/test/suite/group_replication/t/gr_sql_service_failure.test
 share/mysql/test/suite/group_replication/t/gr_ssl.test
 share/mysql/test/suite/group_replication/t/gr_ssl_mode-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_mode-slave.opt
@@ -4991,6 +5012,7 @@ share/mysql/test/suite/innodb/r/high_pri
 share/mysql/test/suite/innodb/r/high_prio_trx_commit_crash.result
 share/mysql/test/suite/innodb/r/high_prio_trx_debug.result
 share/mysql/test/suite/innodb/r/high_prio_trx_fk.result
+share/mysql/test/suite/innodb/r/high_prio_trx_predicate.result
 share/mysql/test/suite/innodb/r/high_prio_trx_rpl.result
 share/mysql/test/suite/innodb/r/i_s_files_debug.result
 share/mysql/test/suite/innodb/r/ibuf_not_empty.result
@@ -5256,6 +5278,7 @@ share/mysql/test/suite/innodb/r/tablespa
 share/mysql/test/suite/innodb/r/tablespace_per_table_windows.result
 share/mysql/test/suite/innodb/r/tablespace_portability.result
 share/mysql/test/suite/innodb/r/tablespace_portability_windows.result
+share/mysql/test/suite/innodb/r/timestamp.result
 share/mysql/test/suite/innodb/r/tmpdir.result
 share/mysql/test/suite/innodb/r/trx_id_future.result
 share/mysql/test/suite/innodb/r/undo.result
@@ -5346,6 +5369,7 @@ share/mysql/test/suite/innodb/t/high_pri
 share/mysql/test/suite/innodb/t/high_prio_trx_commit_crash.test
 share/mysql/test/suite/innodb/t/high_prio_trx_debug.test
 share/mysql/test/suite/innodb/t/high_prio_trx_fk.test
+share/mysql/test/suite/innodb/t/high_prio_trx_predicate.test
 share/mysql/test/suite/innodb/t/high_prio_trx_rpl.test
 share/mysql/test/suite/innodb/t/i_s_files_debug.test
 share/mysql/test/suite/innodb/t/ibuf_not_empty-master.opt
@@ -5671,6 +5695,7 @@ share/mysql/test/suite/innodb/t/tablespa
 share/mysql/test/suite/innodb/t/tablespace_per_table_windows.test
 share/mysql/test/suite/innodb/t/tablespace_portability.test
 share/mysql/test/suite/innodb/t/tablespace_portability_windows.test
+share/mysql/test/suite/innodb/t/timestamp.test
 share/mysql/test/suite/innodb/t/tmpdir.test
 share/mysql/test/suite/innodb/t/trx_id_future.test
 share/mysql/test/suite/innodb/t/undo.test
@@ -9427,6 +9452,7 @@ share/mysql/test/suite/rpl/r/rpl_do_db_f
 share/mysql/test/suite/rpl/r/rpl_do_grant.result
 share/mysql/test/suite/rpl/r/rpl_do_table_filter_insensitive.result
 share/mysql/test/suite/rpl/r/rpl_do_table_filter_sensitive.result
+share/mysql/test/suite/rpl/r/rpl_double_free_bug.result
 share/mysql/test/suite/rpl/r/rpl_drop.result
 share/mysql/test/suite/rpl/r/rpl_drop_db.result
 share/mysql/test/suite/rpl/r/rpl_drop_db_fail.result
@@ -9488,6 +9514,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_hu
 share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_insensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_ignore_table_filter_sensitive.result
 share/mysql/test/suite/rpl/r/rpl_gtid_loaddata_s.result
+share/mysql/test/suite/rpl/r/rpl_gtid_mem_leak_with_skipped_rows_query_log_event.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mode.result
 share/mysql/test/suite/rpl/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
@@ -9495,6 +9522,7 @@ share/mysql/test/suite/rpl/r/rpl_gtid_mt
 share/mysql/test/suite/rpl/r/rpl_gtid_mysqlbinlog_rotate.result
 share/mysql/test/suite/rpl/r/rpl_gtid_not_yet_determined.result
 share/mysql/test/suite/rpl/r/rpl_gtid_parallel.result
+share/mysql/test/suite/rpl/r/rpl_gtid_perfschema_applier_xa_status.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_fail_to_connect.result
 share/mysql/test/suite/rpl/r/rpl_gtid_purged_maintained.result
 share/mysql/test/suite/rpl/r/rpl_gtid_replay_relaylog.result
@@ -9523,6 +9551,7 @@ share/mysql/test/suite/rpl/r/rpl_heartbe
 share/mysql/test/suite/rpl/r/rpl_high_prio_trx_slave.result
 share/mysql/test/suite/rpl/r/rpl_idempotency.result
 share/mysql/test/suite/rpl/r/rpl_ignore_db_filter.result
+share/mysql/test/suite/rpl/r/rpl_ignore_events_mem_growth.result
 share/mysql/test/suite/rpl/r/rpl_ignore_grant.result
 share/mysql/test/suite/rpl/r/rpl_ignore_revoke.result
 share/mysql/test/suite/rpl/r/rpl_ignore_table.result
@@ -9541,6 +9570,7 @@ share/mysql/test/suite/rpl/r/rpl_insert_
 share/mysql/test/suite/rpl/r/rpl_insert_id_pk.result
 share/mysql/test/suite/rpl/r/rpl_insert_ignore.result
 share/mysql/test/suite/rpl/r/rpl_insert_on_update.result
+share/mysql/test/suite/rpl/r/rpl_invalid_mem_access_with_rows_query_log_event.result
 share/mysql/test/suite/rpl/r/rpl_invoked_features.result
 share/mysql/test/suite/rpl/r/rpl_ip_mix.result
 share/mysql/test/suite/rpl/r/rpl_ip_mix2.result
@@ -9548,6 +9578,7 @@ share/mysql/test/suite/rpl/r/rpl_ipv4_as
 share/mysql/test/suite/rpl/r/rpl_ipv6.result
 share/mysql/test/suite/rpl/r/rpl_json.result
 share/mysql/test/suite/rpl/r/rpl_key_rotation.result
+share/mysql/test/suite/rpl/r/rpl_kill_alter_event.result
 share/mysql/test/suite/rpl/r/rpl_kill_query.result
 share/mysql/test/suite/rpl/r/rpl_killed_ddl.result
 share/mysql/test/suite/rpl/r/rpl_known_bugs_detection.result
@@ -9590,6 +9621,7 @@ share/mysql/test/suite/rpl/r/rpl_mts_exe
 share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
 share/mysql/test/suite/rpl/r/rpl_mts_execute_partial_trx_with_auto_pos_on_binlogless_slave.result
 share/mysql/test/suite/rpl/r/rpl_mts_gtids_restart_slave_io_lost_trx.result
+share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_assertion_failure.result
 share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_crash.result
 share/mysql/test/suite/rpl/r/rpl_mts_logical_clock_recovery.result
@@ -9679,6 +9711,7 @@ share/mysql/test/suite/rpl/r/rpl_perfsch
 share/mysql/test/suite/rpl/r/rpl_perfschema_applier_status_by_coordinator.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_applier_status_by_worker.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_applier_status_by_worker_last_seen_transaction.result
+share/mysql/test/suite/rpl/r/rpl_perfschema_applier_xa_status_check.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_connect_config.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_connect_status.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_no_master_uuid.result
@@ -9820,9 +9853,11 @@ share/mysql/test/suite/rpl/r/rpl_semi_sy
 share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_future_logpos.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock.result
+share/mysql/test/suite/rpl/r/rpl_semi_sync_group_commit_deadlock_ssl.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_install_at_start_server.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_non_group_commit_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_shutdown_hang.result
+share/mysql/test/suite/rpl/r/rpl_semi_sync_slave_compressed_protocol.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_wait_slave_count.result
 share/mysql/test/suite/rpl/r/rpl_sequential.result
@@ -9948,11 +9983,13 @@ share/mysql/test/suite/rpl/r/rpl_variabl
 share/mysql/test/suite/rpl/r/rpl_variables_stm_myisam.result
 share/mysql/test/suite/rpl/r/rpl_view.result
 share/mysql/test/suite/rpl/r/rpl_view_multi.result
+share/mysql/test/suite/rpl/r/rpl_virtual_gcol.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_no_timeout.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_executed_gtid_set_with_sleep.result
 share/mysql/test/suite/rpl/r/rpl_wait_for_gtid_executed_unknown_uuid.result
 share/mysql/test/suite/rpl/r/rpl_xa_gap_lock.result
+share/mysql/test/suite/rpl/r/rpl_xa_one_phase_error.result
 share/mysql/test/suite/rpl/r/rpl_xa_prepare.result
 share/mysql/test/suite/rpl/r/rpl_xa_survive_crash_debug.result
 share/mysql/test/suite/rpl/r/rpl_xa_survive_disconnect.result
@@ -10082,6 +10119,7 @@ share/mysql/test/suite/rpl/t/rpl_do_tabl
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_insensitive.test
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive-slave.opt
 share/mysql/test/suite/rpl/t/rpl_do_table_filter_sensitive.test
+share/mysql/test/suite/rpl/t/rpl_double_free_bug.test
 share/mysql/test/suite/rpl/t/rpl_drop.test
 share/mysql/test/suite/rpl/t/rpl_drop_db.test
 share/mysql/test/suite/rpl/t/rpl_drop_db_fail.test
@@ -10176,6 +10214,7 @@ share/mysql/test/suite/rpl/t/rpl_gtid_ig
 share/mysql/test/suite/rpl/t/rpl_gtid_ignore_table_filter_sensitive.test
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_loaddata_s.test
+share/mysql/test/suite/rpl/t/rpl_gtid_mem_leak_with_skipped_rows_query_log_event.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.test
 share/mysql/test/suite/rpl/t/rpl_gtid_mode.test
@@ -10187,6 +10226,7 @@ share/mysql/test/suite/rpl/t/rpl_gtid_mt
 share/mysql/test/suite/rpl/t/rpl_gtid_mysqlbinlog_rotate.test
 share/mysql/test/suite/rpl/t/rpl_gtid_not_yet_determined.test
 share/mysql/test/suite/rpl/t/rpl_gtid_parallel.test
+share/mysql/test/suite/rpl/t/rpl_gtid_perfschema_applier_xa_status.test
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-master.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect-slave.opt
 share/mysql/test/suite/rpl/t/rpl_gtid_purged_fail_to_connect.test
@@ -10228,6 +10268,9 @@ share/mysql/test/suite/rpl/t/rpl_idempot
 share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-master.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_db_filter-slave.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_db_filter.test
+share/mysql/test/suite/rpl/t/rpl_ignore_events_mem_growth-master.opt
+share/mysql/test/suite/rpl/t/rpl_ignore_events_mem_growth-slave.opt
+share/mysql/test/suite/rpl/t/rpl_ignore_events_mem_growth.test
 share/mysql/test/suite/rpl/t/rpl_ignore_grant-slave.opt
 share/mysql/test/suite/rpl/t/rpl_ignore_grant.test
 share/mysql/test/suite/rpl/t/rpl_ignore_revoke-slave.opt
@@ -10260,6 +10303,7 @@ share/mysql/test/suite/rpl/t/rpl_insert_
 share/mysql/test/suite/rpl/t/rpl_insert_id_pk.test
 share/mysql/test/suite/rpl/t/rpl_insert_ignore.test
 share/mysql/test/suite/rpl/t/rpl_insert_on_update.test
+share/mysql/test/suite/rpl/t/rpl_invalid_mem_access_with_rows_query_log_event.test
 share/mysql/test/suite/rpl/t/rpl_invoked_features-master.opt
 share/mysql/test/suite/rpl/t/rpl_invoked_features.test
 share/mysql/test/suite/rpl/t/rpl_ip_mix-master.opt
@@ -10276,6 +10320,7 @@ share/mysql/test/suite/rpl/t/rpl_json.te
 share/mysql/test/suite/rpl/t/rpl_key_rotation-master.opt
 share/mysql/test/suite/rpl/t/rpl_key_rotation-slave.opt
 share/mysql/test/suite/rpl/t/rpl_key_rotation.test
+share/mysql/test/suite/rpl/t/rpl_kill_alter_event.test
 share/mysql/test/suite/rpl/t/rpl_kill_query-slave.opt
 share/mysql/test/suite/rpl/t/rpl_kill_query.test
 share/mysql/test/suite/rpl/t/rpl_killed_ddl-master.opt
@@ -10345,6 +10390,7 @@ share/mysql/test/suite/rpl/t/rpl_mts_exe
 share/mysql/test/suite/rpl/t/rpl_mts_execute_partial_trx_with_auto_pos_on_binlogless_slave.test
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_gtids_restart_slave_io_lost_trx.test
+share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_applier_error_concurrent_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_assertion_failure.test
 share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_crash.test
 share/mysql/test/suite/rpl/t/rpl_mts_logical_clock_recovery-slave.opt
@@ -10488,6 +10534,7 @@ share/mysql/test/suite/rpl/t/rpl_perfsch
 share/mysql/test/suite/rpl/t/rpl_perfschema_applier_status_by_coordinator.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_applier_status_by_worker.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_applier_status_by_worker_last_seen_transaction.test
+share/mysql/test/suite/rpl/t/rpl_perfschema_applier_xa_status_check.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_connect_config.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_connect_status.test
 share/mysql/test/suite/rpl/t/rpl_perfschema_no_master_uuid.test
@@ -10708,6 +10755,9 @@ share/mysql/test/suite/rpl/t/rpl_semi_sy
 share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock.test
+share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl-master.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl-slave.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_group_commit_deadlock_ssl.test
 share/mysql/test/suite/rpl/t/rpl_semi_sync_install_at_start_server-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_install_at_start_server-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_install_at_start_server.cnf
@@ -10718,6 +10768,9 @@ share/mysql/test/suite/rpl/t/rpl_semi_sy
 share/mysql/test/suite/rpl/t/rpl_semi_sync_shutdown_hang-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_shutdown_hang-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_shutdown_hang.test
+share/mysql/test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol-master.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol-slave.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol.test
 share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt
 share/mysql/test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test
@@ -10906,12 +10959,14 @@ share/mysql/test/suite/rpl/t/rpl_variabl
 share/mysql/test/suite/rpl/t/rpl_variables_stm_myisam.test
 share/mysql/test/suite/rpl/t/rpl_view.test
 share/mysql/test/suite/rpl/t/rpl_view_multi.test
+share/mysql/test/suite/rpl/t/rpl_virtual_gcol.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set.cnf
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_no_timeout.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_executed_gtid_set_with_sleep.test
 share/mysql/test/suite/rpl/t/rpl_wait_for_gtid_executed_unknown_uuid.test
 share/mysql/test/suite/rpl/t/rpl_xa_gap_lock.test
+share/mysql/test/suite/rpl/t/rpl_xa_one_phase_error.test
 share/mysql/test/suite/rpl/t/rpl_xa_prepare.test
 share/mysql/test/suite/rpl/t/rpl_xa_survive_crash_debug.test
 share/mysql/test/suite/rpl/t/rpl_xa_survive_disconnect.test
@@ -12893,6 +12948,7 @@ share/mysql/test/suite/x/r/message_proto
 share/mysql/test/suite/x/r/multiple_resultsets_and_out_params.result
 share/mysql/test/suite/x/r/mysql_session_user.result
 share/mysql/test/suite/x/r/mysqlx_server_var.result
+share/mysql/test/suite/x/r/mysqlxtest_help.result
 share/mysql/test/suite/x/r/notice_warning.result
 share/mysql/test/suite/x/r/notice_warning_mysqlx.result
 share/mysql/test/suite/x/r/notices_disable.result
@@ -13077,6 +13133,7 @@ share/mysql/test/suite/x/t/message_proto
 share/mysql/test/suite/x/t/multiple_resultsets_and_out_params.test
 share/mysql/test/suite/x/t/mysql_session_user.test
 share/mysql/test/suite/x/t/mysqlx_server_var.test
+share/mysql/test/suite/x/t/mysqlxtest_help.test
 share/mysql/test/suite/x/t/notice_warning.test
 share/mysql/test/suite/x/t/notice_warning_mysqlx.test
 share/mysql/test/suite/x/t/notices_disable-master.opt
@@ -13767,6 +13824,7 @@ share/mysql/test/t/mysqlpump_concurrency
 share/mysql/test/t/mysqlpump_extended.test
 share/mysql/test/t/mysqlpump_filters.test
 share/mysql/test/t/mysqlpump_multi_thread.test
+share/mysql/test/t/mysqlpump_partial_bkp.test
 share/mysql/test/t/mysqlshow.test
 share/mysql/test/t/mysqlslap.test
 share/mysql/test/t/mysqltest.test



Home | Main Index | Thread Index | Old Index