Changes 5.7.18:

* Windows builds now use the default runtime libraries (builds use the /MD flag).
* CMake support was added for compiling with Developer Studio 12.6.
* MySQL failed to compile if -DENABLE_DEBUG_SYNC=OFF AND -DWITH_DEBUG=ON were both given. The ENABLE_DEBUG_SYNC option has been removed and enabling WITH_DEBUG enables Debug Sync.
* The --temp-pool server option is deprecated and will be removed in MySQL 8.0.
* Support for DTrace is deprecated and is removed in MySQL 8.0.
* Changes in RPM package structure require a larger set of packages to be removed to install MySQL Server cleanly.
* To avoid potential race conditions, Debian packages now use the GNU install utility rather than a combination of mkdir, touch, and chown.
* The my-default.cnf.sh file (used to produce a default my-default.cnf or my-default.ini file) is no longer included in source distributions and my-default.cnf and my-default.ini are no longer included in or installed by distribution packages.
* Reminder: MySQL 5.7 requires the Microsoft Visual C++ 2013 Redistributable Package to run on Windows platforms. Users should make sure the package has been installed on the system before starting the server. The package is available at the Microsoft Download Center.
* PROCEDURE ANALYSE() syntax is now deprecated and is removed in MySQL 8.0.
* The use of \N as a synonym for NULL in SQL statements is deprecated and is removed in MySQL 8.0. Use NULL instead.
* The linked OpenSSL library for the MySQL Commercial Server has been updated to version 1.0.2k.

10 files changed, 115 insertions, 55 deletions

diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile
index 1d4a07e996c..3b04498c60a 100644
--- a/databases/mysql57-client/Makefile
+++ b/databases/mysql57-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/01 16:06:06 adam Exp $
+# $NetBSD: Makefile,v 1.5 2017/04/11 20:49:15 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 d8d851153a4..e96dd9d8b15 100644
--- a/databases/mysql57-client/Makefile.common
+++ b/databases/mysql57-client/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.3 2016/12/12 19:19:42 adam Exp $
+# $NetBSD: Makefile.common,v 1.4 2017/04/11 20:49:15 adam Exp $
 #
 # used by databases/mysql57-client/Makefile
 # used by databases/mysql57-server/Makefile
 
-DISTNAME=	mysql-5.7.17
+DISTNAME=	mysql-5.7.18
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-5.7/}
 
diff --git a/databases/mysql57-client/PLIST b/databases/mysql57-client/PLIST
index f6631319617..0462e3a4152 100644
--- a/databases/mysql57-client/PLIST
+++ b/databases/mysql57-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/12 19:19:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/04/11 20:49:15 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.4
+lib/libmysqlclient.so.20.3.5
 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 0f7a18f5675..ff63c62bd12 100644
--- a/databases/mysql57-client/distinfo
+++ b/databases/mysql57-client/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.9 2017/03/21 15:09:25 maya Exp $
+$NetBSD: distinfo,v 1.10 2017/04/11 20:49:15 adam Exp $
 
-SHA1 (mysql-5.7.17.tar.gz) = 7d159e2d056ab6e10c89e0c8ef12ee7af3b99ef0
-RMD160 (mysql-5.7.17.tar.gz) = acd8714fe1bda26466c4490b9e71d510677ac9a5
-SHA512 (mysql-5.7.17.tar.gz) = 72ef29298354234666264497e302994d4965ddc76129f564d51b48cbeb32f1b012a76d0905be238c8818507e0e5cf68d066e11788077351502880a358ea0df4b
-Size (mysql-5.7.17.tar.gz) = 51433090 bytes
+SHA1 (mysql-5.7.18.tar.gz) = d53fdc5f392af138cd66e13ee6d4e865767181e7
+RMD160 (mysql-5.7.18.tar.gz) = 40264f1c4a9113d6c84356488d2a2a7bc80920ad
+SHA512 (mysql-5.7.18.tar.gz) = 88f8df96008d44328d184402dadf1dc54d5522fd4b0aebc8de8a6c11b4f38ae15d8b7f8112d8ff0015d6d46de11ef9275e1e2fd6b757afafce2a53503d3970dc
+Size (mysql-5.7.18.tar.gz) = 51567774 bytes
 SHA1 (patch-CMakeLists.txt) = b47592cf8801538375da3df2990fde4d292fc365
 SHA1 (patch-client_CMakeLists.txt) = 304023577ab9c2152ca21fa9ff4895a22a321adf
 SHA1 (patch-client_completion_hash.cc) = b86ec80beac624b2aa21c7587e351ff126400ecb
 SHA1 (patch-client_mysqladmin.cc) = e1650ef3695675bcc01375bacdebcb7318218b93
 SHA1 (patch-cmake_boost.cmake) = 1f0a70f110d97a1ab47706ed7d79d4fafa084abd
 SHA1 (patch-cmake_libutils.cmake) = c3e5ab66d2bef43dc2308369e27550553e0f5356
-SHA1 (patch-cmake_os_SunOS.cmake) = f5b44de1cb7e14c33be6ebb961157c67f651df4b
+SHA1 (patch-cmake_os_SunOS.cmake) = 06e290820a75d68931fce6dfd70a0b5edd548320
 SHA1 (patch-cmake_plugin.cmake) = 29db9f49941a011176a6cdd46f3af6c5636afb4a
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
 SHA1 (patch-include_CMakeLists.txt) = 944991702f046ea7a5e2b6ea4dc390f17426e55a
@@ -27,12 +27,12 @@ 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) = 5c14be97bd1fd04b2b845f1a2422452445733474
-SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = 4e8ddfbdfa2d4e1f4b5c9421aeb4a337b5741165
+SHA1 (patch-rapid_plugin_x_CMakeLists.txt) = e2cc48b4d325060a105057bda715f4bd2fdab255
 SHA1 (patch-rapid_unittest_gunit_xplugin_CMakeLists.txt) = a531745be680ee06944678cfd35be10c653d1b17
 SHA1 (patch-scripts_CMakeLists.txt) = b149f40f65c4ce8f6f4a7adf75f5ec4be44319f1
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
 SHA1 (patch-sql_CMakeLists.txt) = d66fe5fc8ac3a6230f1a3aa1395cf72e1a2b682e
-SHA1 (patch-sql_conn__handler_socket__connection.cc) = f2c89f1aca3dae616d32f1b980564d44270f2eba
+SHA1 (patch-sql_conn__handler_socket__connection.cc) = 12cf83e061edbe59eb073037b1036903b7ba4b00
 SHA1 (patch-sql_log_event.h) = 311dc7fb04ea832df229dc2a28bcfbf263670ebf
 SHA1 (patch-storage_archive_CMakeLists.txt) = 4cf5ed97a226a3844e184c46958b5202eefb9dd5
 SHA1 (patch-storage_blackhole_CMakeLists.txt) = 1d066d686172657ce9f812a505c7323a76111a63
diff --git a/databases/mysql57-client/options.mk b/databases/mysql57-client/options.mk
index 07c62f02596..7a5985bd7f6 100644
--- a/databases/mysql57-client/options.mk
+++ b/databases/mysql57-client/options.mk
@@ -1,22 +1,14 @@
-# $NetBSD: options.mk,v 1.1 2016/09/16 06:49:11 adam Exp $
+# $NetBSD: options.mk,v 1.2 2017/04/11 20:49:15 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5
 
 # ndb-cluster does not configure with cmake
-PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster ssl
+PKG_SUPPORTED_OPTIONS+=	dtrace embedded-server ndb-cluster
 PKG_SUPPORTED_OPTIONS+=	memcached
-PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
+PKG_SUGGESTED_OPTIONS+=	embedded-server
 
 .include "../../mk/bsd.options.mk"
 
-# Enable OpenSSL support
-.if !empty(PKG_OPTIONS:Mssl)
-.	include "../../security/openssl/buildlink3.mk"
-CMAKE_ARGS+=		-DWITH_SSL=system
-.else
-CMAKE_ARGS+=		-DWITH_SSL=no
-.endif
-
 # Enable DTrace support
 .if !empty(PKG_OPTIONS:Mdtrace)
 CMAKE_ARGS+=		-DENABLE_DTRACE=ON
diff --git a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
index 831a36ae8c4..383b844cb59 100644
--- a/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
+++ b/databases/mysql57-client/patches/patch-cmake_os_SunOS.cmake
@@ -1,10 +1,10 @@
-$NetBSD: patch-cmake_os_SunOS.cmake,v 1.1 2017/01/03 12:27:27 jperkin Exp $
+$NetBSD: patch-cmake_os_SunOS.cmake,v 1.2 2017/04/11 20:49:15 adam Exp $
 
 Do not attempt to detect ISA, it conflicts with wrappers.
 
---- cmake/os/SunOS.cmake.orig	2016-11-28 13:32:52.000000000 +0000
+--- cmake/os/SunOS.cmake.orig	2017-03-18 07:45:14.000000000 +0000
 +++ cmake/os/SunOS.cmake
-@@ -61,6 +61,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
+@@ -62,6 +62,7 @@ ADD_DEFINITIONS(-D__EXTENSIONS__)
  # http://docs.oracle.com/cd/E19455-01/806-5257/6je9h033k/index.html
  ADD_DEFINITIONS(-D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_PTHREADS)
  
@@ -12,8 +12,8 @@ Do not attempt to detect ISA, it conflicts with wrappers.
  IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLAGS}" MATCHES "-m32|-m64")
    EXECUTE_PROCESS(COMMAND isainfo -b
      OUTPUT_VARIABLE ISAINFO_B
-@@ -75,6 +76,7 @@ IF (NOT "${CMAKE_C_FLAGS}${CMAKE_CXX_FLA
-     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m${ISAINFO_B}")
+@@ -86,6 +87,7 @@ ELSE()
+     SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -m64")
    ENDIF()
  ENDIF()
 +ENDIF()
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 56d3b995034..f0265e426d4 100644
--- a/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
+++ b/databases/mysql57-client/patches/patch-rapid_plugin_x_CMakeLists.txt
@@ -1,21 +1,20 @@
-$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-rapid_plugin_x_CMakeLists.txt,v 1.2 2017/04/11 20:49:15 adam Exp $
 
-Use bundled boost, but system OpenSSL and zlib.
+Use system OpenSSL and zlib.
 Fix mysqlxtest binary linking.
 
---- rapid/plugin/x/CMakeLists.txt.orig	2016-06-30 06:22:11.000000000 +0000
+--- rapid/plugin/x/CMakeLists.txt.orig	2017-03-18 07:45:14.000000000 +0000
 +++ rapid/plugin/x/CMakeLists.txt
-@@ -91,14 +91,14 @@ ELSE()
-     ${CMAKE_CURRENT_SOURCE_DIR}/ngs/include
+@@ -92,14 +92,14 @@ ELSE()
      ${CMAKE_SOURCE_DIR}/include #temporary
      ${CMAKE_CURRENT_SOURCE_DIR}/include/mysql
+     ${CMAKE_CURRENT_BINARY_DIR}/generated
 -    ${SSL_INCLUDE_DIRS}
 -    ${ZLIB_INCLUDE_DIR}
-+    ${BOOST_INCLUDE_DIR}
    )
  
    INCLUDE_DIRECTORIES(SYSTEM
--    ${BOOST_INCLUDE_DIR}
+     ${BOOST_INCLUDE_DIR}
      ${PROTOBUF_INCLUDE_DIRS}
      ${LIBEVENT_INCLUDE_DIR}
 +    ${SSL_INCLUDE_DIRS}
@@ -23,7 +22,7 @@ Fix mysqlxtest binary linking.
    )
  
    IF(XPLUGIN_NO_LITE_PROTOBUF)
-@@ -200,7 +200,10 @@ ELSE()
+@@ -215,7 +215,10 @@ ELSE()
    ENDIF()
  
    TARGET_LINK_LIBRARIES(mysqlxtest mysys strings mysqlclient)
diff --git a/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc b/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
index c12b4041137..cdf8d00fd58 100644
--- a/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
+++ b/databases/mysql57-client/patches/patch-sql_conn__handler_socket__connection.cc
@@ -1,8 +1,8 @@
-$NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.1 2016/09/16 06:49:11 adam Exp $
+$NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.2 2017/04/11 20:49:15 adam Exp $
 
---- sql/conn_handler/socket_connection.cc.orig	2016-03-28 18:06:12.000000000 +0000
+--- sql/conn_handler/socket_connection.cc.orig	2017-03-18 07:45:14.000000000 +0000
 +++ sql/conn_handler/socket_connection.cc
-@@ -939,20 +939,23 @@ Channel_info* Mysqld_socket_listener::li
+@@ -942,17 +942,20 @@ Channel_info* Mysqld_socket_listener::li
      signal(SIGCHLD, SIG_DFL);
      request_init(&req, RQ_DAEMON, m_libwrap_name, RQ_FILE,
                   mysql_socket_getfd(connect_sock), NULL);
@@ -24,9 +24,5 @@ $NetBSD: patch-sql_conn__handler_socket__connection.cc,v 1.1 2016/09/16 06:49:11
 -             "refused connect from %s", eval_client(&req));
 +             "refused connect from %s", my_eval_client(&req));
  
-       if (req.sink)
--        (req.sink)(req.fd);
-+        ((void (*)(int)) (req.sink))(req.fd);
- 
-       mysql_socket_shutdown(listen_sock, SHUT_RDWR);
-       mysql_socket_close(listen_sock);
+ #ifdef HAVE_LIBWRAP_PROTOTYPES
+       // Some distros have patched tcpd.h to have proper prototypes
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 2e259f33026..4b2bf93fbb1 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2017/01/01 16:06:07 adam Exp $
+# $NetBSD: Makefile,v 1.5 2017/04/11 20:49:15 adam Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
-PKGREVISION=	1
 COMMENT=	MySQL 5, a free SQL database (server)
 
 CONFLICTS=	mysql3-server-[0-9]*
diff --git a/databases/mysql57-server/PLIST b/databases/mysql57-server/PLIST
index dc15c0d82f8..69de17d25e5 100644
--- a/databases/mysql57-server/PLIST
+++ b/databases/mysql57-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/12 19:18:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/04/11 20:49:15 adam Exp $
 bin/innochecksum
 bin/lz4_decompress
 bin/my_print_defaults
@@ -131,7 +131,6 @@ share/mysql/italian/errmsg.sys
 share/mysql/japanese/errmsg.sys
 share/mysql/korean/errmsg.sys
 share/mysql/magic
-share/mysql/my-default.cnf
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/mysql_security_commands.sql
@@ -363,6 +362,7 @@ share/mysql/test/include/assert_semisync_master_status_on.inc
 share/mysql/test/include/assert_semisync_yesno_tx_increment.inc
 share/mysql/test/include/assert_status.inc
 share/mysql/test/include/assert_variable.inc
+share/mysql/test/include/backup_tables_priv_and_users.inc
 share/mysql/test/include/begin_include_file.inc
 share/mysql/test/include/begin_replace_gtid_combination.inc
 share/mysql/test/include/big_test.inc
@@ -391,6 +391,7 @@ share/mysql/test/include/check_slave_no_error.inc
 share/mysql/test/include/check_slave_param.inc
 share/mysql/test/include/check_var_limit.inc
 share/mysql/test/include/cleanup_fake_relay_log.inc
+share/mysql/test/include/cleanup_folder.inc
 share/mysql/test/include/commandline_option_test.inc
 share/mysql/test/include/commit.inc
 share/mysql/test/include/commit_crash_restart.inc
@@ -656,6 +657,7 @@ share/mysql/test/include/ipv6_func.inc
 share/mysql/test/include/is_embedded.inc
 share/mysql/test/include/join_cache.inc
 share/mysql/test/include/keyring_udf_keyring_plugin_loaded.inc
+share/mysql/test/include/keyring_udf_keyring_plugin_loaded_symmetric.inc
 share/mysql/test/include/keyring_udf_keyring_plugin_not_loaded.inc
 share/mysql/test/include/keyring_udf_keyring_udf_plugin_not_loaded.inc
 share/mysql/test/include/keyring_udf_missing_plugin.inc
@@ -857,6 +859,7 @@ share/mysql/test/include/show_slave_status.inc
 share/mysql/test/include/shutdown_mysqld.inc
 share/mysql/test/include/sp-vars.inc
 share/mysql/test/include/start_group_replication.inc
+share/mysql/test/include/start_group_replication_command.inc
 share/mysql/test/include/start_mysqld.inc
 share/mysql/test/include/start_slave.inc
 share/mysql/test/include/start_slave_io.inc
@@ -1235,6 +1238,7 @@ share/mysql/test/r/func_encrypt.result
 share/mysql/test/r/func_encrypt_nossl.result
 share/mysql/test/r/func_encrypt_ucs2.result
 share/mysql/test/r/func_equal.result
+share/mysql/test/r/func_found_rows.result
 share/mysql/test/r/func_gconcat.result
 share/mysql/test/r/func_group.result
 share/mysql/test/r/func_group_innodb.result
@@ -1556,6 +1560,7 @@ share/mysql/test/r/mysqldump-max.result
 share/mysql/test/r/mysqldump-no-binlog.result
 share/mysql/test/r/mysqldump.result
 share/mysql/test/r/mysqldump_restore.result
+share/mysql/test/r/mysqldumpslow.result
 share/mysql/test/r/mysqlimport.result
 share/mysql/test/r/mysqlpump.result
 share/mysql/test/r/mysqlpump_basic.result
@@ -1601,6 +1606,7 @@ share/mysql/test/r/one_thread_per_connection.require
 share/mysql/test/r/openssl.require
 share/mysql/test/r/openssl_1.result
 share/mysql/test/r/opt_costmodel.result
+share/mysql/test/r/opt_costmodel_downgrade.result
 share/mysql/test/r/opt_costmodel_flush.result
 share/mysql/test/r/opt_costmodel_pfs.result
 share/mysql/test/r/opt_costmodel_restart.result
@@ -4077,10 +4083,12 @@ share/mysql/test/suite/group_replication/r/gr_applier_initialization.result
 share/mysql/test/suite/group_replication/r/gr_applier_received_set.result
 share/mysql/test/suite/group_replication/r/gr_applier_slave_commands.result
 share/mysql/test/suite/group_replication/r/gr_applier_thread_error_detection.result
+share/mysql/test/suite/group_replication/r/gr_applier_thread_failure_detection.result
 share/mysql/test/suite/group_replication/r/gr_auto_increment_increment.result
 share/mysql/test/suite/group_replication/r/gr_auto_increment_start_stop_parallel.result
 share/mysql/test/suite/group_replication/r/gr_autoincrement_parallel_insert.result
 share/mysql/test/suite/group_replication/r/gr_autostart_on_install.result
+share/mysql/test/suite/group_replication/r/gr_basic_crud_on_doc.result
 share/mysql/test/suite/group_replication/r/gr_binlog_replay_to_group.result
 share/mysql/test/suite/group_replication/r/gr_blob.result
 share/mysql/test/suite/group_replication/r/gr_capture.result
@@ -4106,6 +4114,7 @@ share/mysql/test/suite/group_replication/r/gr_crash_recovery_server.result
 share/mysql/test/suite/group_replication/r/gr_crash_safe_master.result
 share/mysql/test/suite/group_replication/r/gr_crash_server_id.result
 share/mysql/test/suite/group_replication/r/gr_crash_while_dml_and_some_server_recovering.result
+share/mysql/test/suite/group_replication/r/gr_crud_basic.result
 share/mysql/test/suite/group_replication/r/gr_crud_sql_service.result
 share/mysql/test/suite/group_replication/r/gr_ddl_no_autocommit.result
 share/mysql/test/suite/group_replication/r/gr_delayed_view_change_write_local_commit.result
@@ -4161,6 +4170,7 @@ share/mysql/test/suite/group_replication/r/gr_majority_loss_5_to_2.result
 share/mysql/test/suite/group_replication/r/gr_majority_loss_5_to_2_recovery.result
 share/mysql/test/suite/group_replication/r/gr_majority_loss_restart.result
 share/mysql/test/suite/group_replication/r/gr_max_group_size.result
+share/mysql/test/suite/group_replication/r/gr_member_expel_during_shutdown.result
 share/mysql/test/suite/group_replication/r/gr_member_host_port.result
 share/mysql/test/suite/group_replication/r/gr_multi_level_foreign_key.result
 share/mysql/test/suite/group_replication/r/gr_multi_primary_foreign_key_conflict.result
@@ -4238,6 +4248,7 @@ share/mysql/test/suite/group_replication/r/gr_relay_log_name_change.result
 share/mysql/test/suite/group_replication/r/gr_relay_log_recovery.result
 share/mysql/test/suite/group_replication/r/gr_repeatable_read_isolation.result
 share/mysql/test/suite/group_replication/r/gr_replicate_group_to_server.result
+share/mysql/test/suite/group_replication/r/gr_replicate_group_to_server_parallel_applier_db.result
 share/mysql/test/suite/group_replication/r/gr_replicate_server_to_group.result
 share/mysql/test/suite/group_replication/r/gr_replicate_server_to_group_conflict.result
 share/mysql/test/suite/group_replication/r/gr_reset_master.result
@@ -4263,6 +4274,7 @@ share/mysql/test/suite/group_replication/r/gr_show_slave_status_for_channel_reco
 share/mysql/test/suite/group_replication/r/gr_single_primary_and_leader_election.result
 share/mysql/test/suite/group_replication/r/gr_single_primary_and_leader_election_on_error.result
 share/mysql/test/suite/group_replication/r/gr_single_primary_conflict_detection.result
+share/mysql/test/suite/group_replication/r/gr_single_primary_double_change.result
 share/mysql/test/suite/group_replication/r/gr_single_primary_majority_loss_1.result
 share/mysql/test/suite/group_replication/r/gr_single_primary_majority_loss_2.result
 share/mysql/test/suite/group_replication/r/gr_single_primary_member_off_status_check.result
@@ -4334,6 +4346,8 @@ share/mysql/test/suite/group_replication/r/gr_wait_for_executed_gtid_set_with_sl
 share/mysql/test/suite/group_replication/r/gr_without_perfschema.result
 share/mysql/test/suite/group_replication/r/gr_write_set_extraction_algorithm.result
 share/mysql/test/suite/group_replication/r/gr_xa.result
+share/mysql/test/suite/group_replication/r/gr_xplugin_basic_dml.result
+share/mysql/test/suite/group_replication/r/gr_xplugin_global_variables.result
 share/mysql/test/suite/group_replication/r/group_replication.result
 share/mysql/test/suite/group_replication/rpl_1slave_base.cnf
 share/mysql/test/suite/group_replication/t/disabled.def
@@ -4352,6 +4366,7 @@ share/mysql/test/suite/group_replication/t/gr_applier_initialization.test
 share/mysql/test/suite/group_replication/t/gr_applier_received_set.test
 share/mysql/test/suite/group_replication/t/gr_applier_slave_commands.test
 share/mysql/test/suite/group_replication/t/gr_applier_thread_error_detection.test
+share/mysql/test/suite/group_replication/t/gr_applier_thread_failure_detection.test
 share/mysql/test/suite/group_replication/t/gr_auto_increment_increment-slave.opt
 share/mysql/test/suite/group_replication/t/gr_auto_increment_increment.cnf
 share/mysql/test/suite/group_replication/t/gr_auto_increment_increment.test
@@ -4360,6 +4375,8 @@ share/mysql/test/suite/group_replication/t/gr_auto_increment_start_stop_parallel
 share/mysql/test/suite/group_replication/t/gr_autoincrement_parallel_insert.test
 share/mysql/test/suite/group_replication/t/gr_autostart_on_install-slave.opt
 share/mysql/test/suite/group_replication/t/gr_autostart_on_install.test
+share/mysql/test/suite/group_replication/t/gr_basic_crud_on_doc.cnf
+share/mysql/test/suite/group_replication/t/gr_basic_crud_on_doc.test
 share/mysql/test/suite/group_replication/t/gr_binlog_replay_to_group.cnf
 share/mysql/test/suite/group_replication/t/gr_binlog_replay_to_group.test
 share/mysql/test/suite/group_replication/t/gr_blob.test
@@ -4401,6 +4418,8 @@ share/mysql/test/suite/group_replication/t/gr_crash_safe_master.test
 share/mysql/test/suite/group_replication/t/gr_crash_server_id.test
 share/mysql/test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.cnf
 share/mysql/test/suite/group_replication/t/gr_crash_while_dml_and_some_server_recovering.test
+share/mysql/test/suite/group_replication/t/gr_crud_basic.cnf
+share/mysql/test/suite/group_replication/t/gr_crud_basic.test
 share/mysql/test/suite/group_replication/t/gr_crud_sql_service.test
 share/mysql/test/suite/group_replication/t/gr_ddl_no_autocommit.test
 share/mysql/test/suite/group_replication/t/gr_delayed_view_change_write_local_commit.cnf
@@ -4480,6 +4499,8 @@ share/mysql/test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.cnf
 share/mysql/test/suite/group_replication/t/gr_majority_loss_5_to_2_recovery.test
 share/mysql/test/suite/group_replication/t/gr_majority_loss_restart.test
 share/mysql/test/suite/group_replication/t/gr_max_group_size.test
+share/mysql/test/suite/group_replication/t/gr_member_expel_during_shutdown.cnf
+share/mysql/test/suite/group_replication/t/gr_member_expel_during_shutdown.test
 share/mysql/test/suite/group_replication/t/gr_member_host_port.test
 share/mysql/test/suite/group_replication/t/gr_multi_level_foreign_key.test
 share/mysql/test/suite/group_replication/t/gr_multi_primary_foreign_key_conflict.test
@@ -4598,6 +4619,8 @@ share/mysql/test/suite/group_replication/t/gr_relay_log_recovery.test
 share/mysql/test/suite/group_replication/t/gr_repeatable_read_isolation.test
 share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server.cnf
 share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server.test
+share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.cnf
+share/mysql/test/suite/group_replication/t/gr_replicate_group_to_server_parallel_applier_db.test
 share/mysql/test/suite/group_replication/t/gr_replicate_server_to_group.cnf
 share/mysql/test/suite/group_replication/t/gr_replicate_server_to_group.test
 share/mysql/test/suite/group_replication/t/gr_replicate_server_to_group_conflict.cnf
@@ -4635,6 +4658,8 @@ share/mysql/test/suite/group_replication/t/gr_single_primary_and_leader_election
 share/mysql/test/suite/group_replication/t/gr_single_primary_and_leader_election_on_error.test
 share/mysql/test/suite/group_replication/t/gr_single_primary_conflict_detection.cnf
 share/mysql/test/suite/group_replication/t/gr_single_primary_conflict_detection.test
+share/mysql/test/suite/group_replication/t/gr_single_primary_double_change.cnf
+share/mysql/test/suite/group_replication/t/gr_single_primary_double_change.test
 share/mysql/test/suite/group_replication/t/gr_single_primary_majority_loss_1.cnf
 share/mysql/test/suite/group_replication/t/gr_single_primary_majority_loss_1.test
 share/mysql/test/suite/group_replication/t/gr_single_primary_majority_loss_2.cnf
@@ -4739,12 +4764,14 @@ share/mysql/test/suite/group_replication/t/gr_without_perfschema.test
 share/mysql/test/suite/group_replication/t/gr_write_set_extraction_algorithm-slave.opt
 share/mysql/test/suite/group_replication/t/gr_write_set_extraction_algorithm.test
 share/mysql/test/suite/group_replication/t/gr_xa.test
+share/mysql/test/suite/group_replication/t/gr_xplugin_basic_dml.cnf
+share/mysql/test/suite/group_replication/t/gr_xplugin_basic_dml.test
+share/mysql/test/suite/group_replication/t/gr_xplugin_global_variables.test
 share/mysql/test/suite/group_replication/t/group_replication.test
 share/mysql/test/suite/group_replication/t/suite.opt
 share/mysql/test/suite/innodb/include/alter_table_pk_no_sort.inc
 share/mysql/test/suite/innodb/include/check_pfs_mem_other_is_zero.inc
 share/mysql/test/suite/innodb/include/checksum_not_strict.inc
-share/mysql/test/suite/innodb/include/cleanup_folder.inc
 share/mysql/test/suite/innodb/include/create_options_invalid.inc
 share/mysql/test/suite/innodb/include/create_workload_itt.inc
 share/mysql/test/suite/innodb/include/default_row_format_alter.inc
@@ -4759,6 +4786,7 @@ share/mysql/test/suite/innodb/include/innodb_bulk_create_index.inc
 share/mysql/test/suite/innodb/include/innodb_bulk_create_index_debug.inc
 share/mysql/test/suite/innodb/include/innodb_dict.inc
 share/mysql/test/suite/innodb/include/innodb_import.inc
+share/mysql/test/suite/innodb/include/innodb_isolation_selects.inc
 share/mysql/test/suite/innodb/include/innodb_merge_threshold_delete.inc
 share/mysql/test/suite/innodb/include/innodb_merge_threshold_secondary.inc
 share/mysql/test/suite/innodb/include/innodb_merge_threshold_update.inc
@@ -4769,7 +4797,6 @@ share/mysql/test/suite/innodb/include/innodb_undo_logs_action.inc
 share/mysql/test/suite/innodb/include/innodb_v_large_col.inc
 share/mysql/test/suite/innodb/include/innodb_wl6501_crash.inc
 share/mysql/test/suite/innodb/include/innodb_wl6501_crash_temp.inc
-share/mysql/test/suite/innodb/include/innodb_wl6742_selects.inc
 share/mysql/test/suite/innodb/include/log_file_cleanup.inc
 share/mysql/test/suite/innodb/include/query_workload_itt.inc
 share/mysql/test/suite/innodb/include/show_i_s_tables.inc
@@ -4824,6 +4851,7 @@ share/mysql/test/suite/innodb/r/default_row_format_compatibility.result
 share/mysql/test/suite/innodb/r/default_row_format_tablespace.result
 share/mysql/test/suite/innodb/r/doublewrite.result
 share/mysql/test/suite/innodb/r/dropdb.result
+share/mysql/test/suite/innodb/r/end_range_check.result
 share/mysql/test/suite/innodb/r/file_format_defaults.result
 share/mysql/test/suite/innodb/r/file_format_upgrade_16k.result
 share/mysql/test/suite/innodb/r/flush-hang.result
@@ -4841,6 +4869,7 @@ 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_rpl.result
 share/mysql/test/suite/innodb/r/i_s_files_debug.result
+share/mysql/test/suite/innodb/r/ibuf_not_empty.result
 share/mysql/test/suite/innodb/r/import.result
 share/mysql/test/suite/innodb/r/import_export_4k.result
 share/mysql/test/suite/innodb/r/import_update_stats.result
@@ -4877,6 +4906,7 @@ share/mysql/test/suite/innodb/r/innodb-index-online-purge.result
 share/mysql/test/suite/innodb/r/innodb-index-online.result
 share/mysql/test/suite/innodb/r/innodb-index.result
 share/mysql/test/suite/innodb/r/innodb-index_ucs2.result
+share/mysql/test/suite/innodb/r/innodb-isolation.result
 share/mysql/test/suite/innodb/r/innodb-large-prefix.result
 share/mysql/test/suite/innodb/r/innodb-lock-inherit-read_commited.result
 share/mysql/test/suite/innodb/r/innodb-lock.result
@@ -4888,6 +4918,7 @@ share/mysql/test/suite/innodb/r/innodb-status-output.result
 share/mysql/test/suite/innodb/r/innodb-system-table-view.result
 share/mysql/test/suite/innodb/r/innodb-table-online.result
 share/mysql/test/suite/innodb/r/innodb-timeout.result
+share/mysql/test/suite/innodb/r/innodb-truncate-debug.result
 share/mysql/test/suite/innodb/r/innodb-truncate.result
 share/mysql/test/suite/innodb/r/innodb-ucs2.result
 share/mysql/test/suite/innodb/r/innodb-update-insert.result
@@ -4904,7 +4935,6 @@ share/mysql/test/suite/innodb/r/innodb-wl6045-linux.result
 share/mysql/test/suite/innodb/r/innodb-wl6445-1.result
 share/mysql/test/suite/innodb/r/innodb-wl6445-2.result
 share/mysql/test/suite/innodb/r/innodb-wl6445.result
-share/mysql/test/suite/innodb/r/innodb-wl6742.result
 share/mysql/test/suite/innodb/r/innodb.result
 share/mysql/test/suite/innodb/r/innodb_32k.result
 share/mysql/test/suite/innodb/r/innodb_64k.result
@@ -4999,6 +5029,7 @@ share/mysql/test/suite/innodb/r/innodb_high_prio_rpl.result
 share/mysql/test/suite/innodb/r/innodb_i_s_innodb_locks.result
 share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result
 share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
+share/mysql/test/suite/innodb/r/innodb_io_pf.result
 share/mysql/test/suite/innodb/r/innodb_lock_wait_timeout_1.result
 share/mysql/test/suite/innodb/r/innodb_misc1.result
 share/mysql/test/suite/innodb/r/innodb_multi_update.result
@@ -5073,8 +5104,10 @@ share/mysql/test/suite/innodb/r/page_reorganize.result
 share/mysql/test/suite/innodb/r/partition-blob.result
 share/mysql/test/suite/innodb/r/partition-upgrade.result
 share/mysql/test/suite/innodb/r/partition.result
+share/mysql/test/suite/innodb/r/readahead.result
 share/mysql/test/suite/innodb/r/readonly.result
 share/mysql/test/suite/innodb/r/records_in_range.result
+share/mysql/test/suite/innodb/r/redo_log_during_checkpoint.result
 share/mysql/test/suite/innodb/r/row_format_redundant.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
 share/mysql/test/suite/innodb/r/stored_fk.result
@@ -5170,6 +5203,7 @@ share/mysql/test/suite/innodb/t/default_row_format_tablespace.test
 share/mysql/test/suite/innodb/t/disabled.def
 share/mysql/test/suite/innodb/t/doublewrite.test
 share/mysql/test/suite/innodb/t/dropdb.test
+share/mysql/test/suite/innodb/t/end_range_check.test
 share/mysql/test/suite/innodb/t/file_format_defaults-master.opt
 share/mysql/test/suite/innodb/t/file_format_defaults.test
 share/mysql/test/suite/innodb/t/file_format_upgrade_16k.test
@@ -5188,6 +5222,8 @@ 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_rpl.test
 share/mysql/test/suite/innodb/t/i_s_files_debug.test
+share/mysql/test/suite/innodb/t/ibuf_not_empty-master.opt
+share/mysql/test/suite/innodb/t/ibuf_not_empty.test
 share/mysql/test/suite/innodb/t/import.test
 share/mysql/test/suite/innodb/t/import_export_4k.test
 share/mysql/test/suite/innodb/t/import_update_stats.test
@@ -5234,6 +5270,7 @@ share/mysql/test/suite/innodb/t/innodb-index-online-purge.test
 share/mysql/test/suite/innodb/t/innodb-index-online.test
 share/mysql/test/suite/innodb/t/innodb-index.test
 share/mysql/test/suite/innodb/t/innodb-index_ucs2.test
+share/mysql/test/suite/innodb/t/innodb-isolation.test
 share/mysql/test/suite/innodb/t/innodb-large-prefix.test
 share/mysql/test/suite/innodb/t/innodb-lock-inherit-read_commited.test
 share/mysql/test/suite/innodb/t/innodb-lock.test
@@ -5248,6 +5285,7 @@ share/mysql/test/suite/innodb/t/innodb-system-table-view.test
 share/mysql/test/suite/innodb/t/innodb-table-online-master.opt
 share/mysql/test/suite/innodb/t/innodb-table-online.test
 share/mysql/test/suite/innodb/t/innodb-timeout.test
+share/mysql/test/suite/innodb/t/innodb-truncate-debug.test
 share/mysql/test/suite/innodb/t/innodb-truncate.test
 share/mysql/test/suite/innodb/t/innodb-ucs2.test
 share/mysql/test/suite/innodb/t/innodb-update-insert.test
@@ -5267,7 +5305,6 @@ share/mysql/test/suite/innodb/t/innodb-wl6045-linux.test
 share/mysql/test/suite/innodb/t/innodb-wl6445-1.test
 share/mysql/test/suite/innodb/t/innodb-wl6445-2.test
 share/mysql/test/suite/innodb/t/innodb-wl6445.test
-share/mysql/test/suite/innodb/t/innodb-wl6742.test
 share/mysql/test/suite/innodb/t/innodb.test
 share/mysql/test/suite/innodb/t/innodb_32k.test
 share/mysql/test/suite/innodb/t/innodb_64k-master.opt
@@ -5382,6 +5419,7 @@ share/mysql/test/suite/innodb/t/innodb_force_recovery.test
 share/mysql/test/suite/innodb/t/innodb_i_s_innodb_locks.test
 share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test
 share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.test
+share/mysql/test/suite/innodb/t/innodb_io_pf.test
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1-master.opt
 share/mysql/test/suite/innodb/t/innodb_lock_wait_timeout_1.test
 share/mysql/test/suite/innodb/t/innodb_misc1-master.opt
@@ -5479,8 +5517,10 @@ share/mysql/test/suite/innodb/t/partition-upgrade.test
 share/mysql/test/suite/innodb/t/partition.test
 share/mysql/test/suite/innodb/t/portability_wl5980_linux.zip
 share/mysql/test/suite/innodb/t/portability_wl5980_windows.zip
+share/mysql/test/suite/innodb/t/readahead.test
 share/mysql/test/suite/innodb/t/readonly.test
 share/mysql/test/suite/innodb/t/records_in_range.test
+share/mysql/test/suite/innodb/t/redo_log_during_checkpoint.test
 share/mysql/test/suite/innodb/t/row_format_redundant.test
 share/mysql/test/suite/innodb/t/sp_temp_table.test
 share/mysql/test/suite/innodb/t/stored_fk.test
@@ -5828,6 +5868,7 @@ share/mysql/test/suite/innodb_undo/r/trunc_multi_client_01.result
 share/mysql/test/suite/innodb_undo/r/trunc_multi_client_02.result
 share/mysql/test/suite/innodb_undo/r/truncate.result
 share/mysql/test/suite/innodb_undo/r/truncate_recover.result
+share/mysql/test/suite/innodb_undo/r/undo_space_id.result
 share/mysql/test/suite/innodb_undo/t/i_s_files_16k.test
 share/mysql/test/suite/innodb_undo/t/i_s_files_32k.test
 share/mysql/test/suite/innodb_undo/t/i_s_files_4k.test
@@ -5843,6 +5884,9 @@ share/mysql/test/suite/innodb_undo/t/truncate-master.opt
 share/mysql/test/suite/innodb_undo/t/truncate.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover-master.opt
 share/mysql/test/suite/innodb_undo/t/truncate_recover.test
+share/mysql/test/suite/innodb_undo/t/undo_space_id-master.opt
+share/mysql/test/suite/innodb_undo/t/undo_space_id.cnf
+share/mysql/test/suite/innodb_undo/t/undo_space_id.test
 share/mysql/test/suite/innodb_zip/include/innodb-wl6045.inc
 share/mysql/test/suite/innodb_zip/include/innodb_create_tab_indx.inc
 share/mysql/test/suite/innodb_zip/include/innodb_dml_ops.inc
@@ -8336,6 +8380,7 @@ share/mysql/test/suite/perfschema/r/stage_mdl_function.result
 share/mysql/test/suite/perfschema/r/stage_mdl_global.result
 share/mysql/test/suite/perfschema/r/stage_mdl_procedure.result
 share/mysql/test/suite/perfschema/r/stage_mdl_table.result
+share/mysql/test/suite/perfschema/r/start_server_1_digest.result
 share/mysql/test/suite/perfschema/r/start_server_disable_idle.result
 share/mysql/test/suite/perfschema/r/start_server_disable_stages.result
 share/mysql/test/suite/perfschema/r/start_server_disable_statements.result
@@ -8848,6 +8893,8 @@ share/mysql/test/suite/perfschema/t/stage_mdl_global-master.opt
 share/mysql/test/suite/perfschema/t/stage_mdl_global.test
 share/mysql/test/suite/perfschema/t/stage_mdl_procedure.test
 share/mysql/test/suite/perfschema/t/stage_mdl_table.test
+share/mysql/test/suite/perfschema/t/start_server_1_digest-master.opt
+share/mysql/test/suite/perfschema/t/start_server_1_digest.test
 share/mysql/test/suite/perfschema/t/start_server_disable_idle-master.opt
 share/mysql/test/suite/perfschema/t/start_server_disable_idle.test
 share/mysql/test/suite/perfschema/t/start_server_disable_stages-master.opt
@@ -9169,6 +9216,7 @@ share/mysql/test/suite/rpl/r/rpl_LD_INFILE.result
 share/mysql/test/suite/rpl/r/rpl_alter.result
 share/mysql/test/suite/rpl/r/rpl_alter_db.result
 share/mysql/test/suite/rpl/r/rpl_alter_repository.result
+share/mysql/test/suite/rpl/r/rpl_alter_user.result
 share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
 share/mysql/test/suite/rpl/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment.result
@@ -9189,6 +9237,7 @@ share/mysql/test/suite/rpl/r/rpl_binlog_index.result
 share/mysql/test/suite/rpl/r/rpl_binlog_invalid_event.result
 share/mysql/test/suite/rpl/r/rpl_binlog_json.result
 share/mysql/test/suite/rpl/r/rpl_binlog_sender_fseek.result
+share/mysql/test/suite/rpl/r/rpl_binlog_sender_packet_shrink.result
 share/mysql/test/suite/rpl/r/rpl_bit.result
 share/mysql/test/suite/rpl/r/rpl_bit_npk.result
 share/mysql/test/suite/rpl/r/rpl_blackhole.result
@@ -9486,6 +9535,7 @@ share/mysql/test/suite/rpl/r/rpl_perfschema_no_master_uuid.result
 share/mysql/test/suite/rpl/r/rpl_perfschema_threads_processlist_status.result
 share/mysql/test/suite/rpl/r/rpl_plugin_load.result
 share/mysql/test/suite/rpl/r/rpl_ps.result
+share/mysql/test/suite/rpl/r/rpl_pump.result
 share/mysql/test/suite/rpl/r/rpl_rbr_to_sbr.result
 share/mysql/test/suite/rpl/r/rpl_read_old_relay_log_info.result
 share/mysql/test/suite/rpl/r/rpl_read_only.result
@@ -9609,6 +9659,7 @@ share/mysql/test/suite/rpl/r/rpl_row_utf32.result
 share/mysql/test/suite/rpl/r/rpl_row_view01.result
 share/mysql/test/suite/rpl/r/rpl_row_wide_table.result
 share/mysql/test/suite/rpl/r/rpl_savepoint.result
+share/mysql/test/suite/rpl/r/rpl_sbm_fake_rotate_event.result
 share/mysql/test/suite/rpl/r/rpl_sbm_previous_gtid_event.result
 share/mysql/test/suite/rpl/r/rpl_seconds_behind_master.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync.result
@@ -9730,6 +9781,7 @@ share/mysql/test/suite/rpl/r/rpl_trx_boundary_parser_relay_log_recovery.result
 share/mysql/test/suite/rpl/r/rpl_trx_boundary_parser_row.result
 share/mysql/test/suite/rpl/r/rpl_trx_boundary_parser_stmt.result
 share/mysql/test/suite/rpl/r/rpl_trx_boundary_parser_warning.result
+share/mysql/test/suite/rpl/r/rpl_type_conv_utf8_utf8mb4.result
 share/mysql/test/suite/rpl/r/rpl_typeconv.result
 share/mysql/test/suite/rpl/r/rpl_typeconv_innodb.result
 share/mysql/test/suite/rpl/r/rpl_udf.result
@@ -9749,6 +9801,7 @@ 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_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
 share/mysql/test/suite/rpl/r/rpl_xa_survive_disconnect_lsu_off.result
@@ -9774,6 +9827,7 @@ share/mysql/test/suite/rpl/t/rpl_LD_INFILE.test
 share/mysql/test/suite/rpl/t/rpl_alter.test
 share/mysql/test/suite/rpl/t/rpl_alter_db.test
 share/mysql/test/suite/rpl/t/rpl_alter_repository.test
+share/mysql/test/suite/rpl/t/rpl_alter_user.test
 share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
 share/mysql/test/suite/rpl/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment-master.opt
@@ -9801,6 +9855,7 @@ share/mysql/test/suite/rpl/t/rpl_binlog_invalid_event-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_invalid_event.test
 share/mysql/test/suite/rpl/t/rpl_binlog_json.test
 share/mysql/test/suite/rpl/t/rpl_binlog_sender_fseek.test
+share/mysql/test/suite/rpl/t/rpl_binlog_sender_packet_shrink.test
 share/mysql/test/suite/rpl/t/rpl_bit.test
 share/mysql/test/suite/rpl/t/rpl_bit_npk.test
 share/mysql/test/suite/rpl/t/rpl_blackhole.test
@@ -10274,6 +10329,9 @@ share/mysql/test/suite/rpl/t/rpl_plugin_load-master.opt
 share/mysql/test/suite/rpl/t/rpl_plugin_load-slave.opt
 share/mysql/test/suite/rpl/t/rpl_plugin_load.test
 share/mysql/test/suite/rpl/t/rpl_ps.test
+share/mysql/test/suite/rpl/t/rpl_pump-master.opt
+share/mysql/test/suite/rpl/t/rpl_pump-slave.opt
+share/mysql/test/suite/rpl/t/rpl_pump.test
 share/mysql/test/suite/rpl/t/rpl_rbr_to_sbr.test
 share/mysql/test/suite/rpl/t/rpl_read_old_relay_log_info.test
 share/mysql/test/suite/rpl/t/rpl_read_only.test
@@ -10456,6 +10514,7 @@ share/mysql/test/suite/rpl/t/rpl_row_utf32.test
 share/mysql/test/suite/rpl/t/rpl_row_view01.test
 share/mysql/test/suite/rpl/t/rpl_row_wide_table.test
 share/mysql/test/suite/rpl/t/rpl_savepoint.test
+share/mysql/test/suite/rpl/t/rpl_sbm_fake_rotate_event.test
 share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event-slave.opt
 share/mysql/test/suite/rpl/t/rpl_sbm_previous_gtid_event.test
 share/mysql/test/suite/rpl/t/rpl_seconds_behind_master.test
@@ -10659,6 +10718,8 @@ share/mysql/test/suite/rpl/t/rpl_trx_boundary_parser_relay_log_recovery.test
 share/mysql/test/suite/rpl/t/rpl_trx_boundary_parser_row.test
 share/mysql/test/suite/rpl/t/rpl_trx_boundary_parser_stmt.test
 share/mysql/test/suite/rpl/t/rpl_trx_boundary_parser_warning.test
+share/mysql/test/suite/rpl/t/rpl_type_conv_utf8_utf8mb4-slave.opt
+share/mysql/test/suite/rpl/t/rpl_type_conv_utf8_utf8mb4.test
 share/mysql/test/suite/rpl/t/rpl_typeconv-master.opt
 share/mysql/test/suite/rpl/t/rpl_typeconv.test
 share/mysql/test/suite/rpl/t/rpl_typeconv_innodb.test
@@ -10683,6 +10744,7 @@ 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_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
 share/mysql/test/suite/rpl/t/rpl_xa_survive_disconnect_lsu_off-slave.opt
@@ -12510,6 +12572,8 @@ share/mysql/test/suite/x/include/connection_ssl.inc
 share/mysql/test/suite/x/include/connection_user_authentication.inc
 share/mysql/test/suite/x/include/have_performance_schema_threads.inc
 share/mysql/test/suite/x/include/is_local_machine.inc
+share/mysql/test/suite/x/include/mysqlxtest_expected_error.inc
+share/mysql/test/suite/x/include/mysqlxtest_macro_dir.inc
 share/mysql/test/suite/x/include/performance_schema_assert_empty_worker_threads.inc
 share/mysql/test/suite/x/include/restart_mysqld_and_wait_for_xplugin.inc
 share/mysql/test/suite/x/include/restart_mysqld_pipe.inc
@@ -12533,6 +12597,8 @@ share/mysql/test/suite/x/r/admin_ensure_collection_mysqlx.result
 share/mysql/test/suite/x/r/admin_kill.result
 share/mysql/test/suite/x/r/admin_kill_client_mysqlx.result
 share/mysql/test/suite/x/r/admin_list_objects.result
+share/mysql/test/suite/x/r/admin_list_objects_case_insensitive_names.result
+share/mysql/test/suite/x/r/admin_list_objects_case_sensitive_names.result
 share/mysql/test/suite/x/r/admin_list_objects_mysqlx.result
 share/mysql/test/suite/x/r/admin_ping.result
 share/mysql/test/suite/x/r/admin_ping_mysqlx.result
@@ -12663,6 +12729,7 @@ share/mysql/test/suite/x/r/result_types.result
 share/mysql/test/suite/x/r/session_reset.result
 share/mysql/test/suite/x/r/status_bytes_received.result
 share/mysql/test/suite/x/r/status_variable_errors_unknown_message_type.result
+share/mysql/test/suite/x/r/status_variable_notices.result
 share/mysql/test/suite/x/r/status_variables.result
 share/mysql/test/suite/x/r/status_variables_incrementing.result
 share/mysql/test/suite/x/r/stmtexecute_query_no_result.result
@@ -12696,6 +12763,8 @@ share/mysql/test/suite/x/t/admin_ensure_collection_mysqlx.test
 share/mysql/test/suite/x/t/admin_kill.test
 share/mysql/test/suite/x/t/admin_kill_client_mysqlx.test
 share/mysql/test/suite/x/t/admin_list_objects.test
+share/mysql/test/suite/x/t/admin_list_objects_case_insensitive_names.test
+share/mysql/test/suite/x/t/admin_list_objects_case_sensitive_names.test
 share/mysql/test/suite/x/t/admin_list_objects_mysqlx.test
 share/mysql/test/suite/x/t/admin_ping.test
 share/mysql/test/suite/x/t/admin_ping_mysqlx.test
@@ -12710,6 +12779,7 @@ share/mysql/test/suite/x/t/client_close_abort.test
 share/mysql/test/suite/x/t/client_session.test
 share/mysql/test/suite/x/t/connection.test
 share/mysql/test/suite/x/t/connection_expire.test
+share/mysql/test/suite/x/t/connection_ipv6-master.opt
 share/mysql/test/suite/x/t/connection_ipv6.test
 share/mysql/test/suite/x/t/connection_mysqlxsys.test
 share/mysql/test/suite/x/t/connection_nonssl-master.opt
@@ -12814,6 +12884,7 @@ share/mysql/test/suite/x/t/insert_table_missing_notnull_column.test
 share/mysql/test/suite/x/t/insert_table_string_quoting.test
 share/mysql/test/suite/x/t/installxplugin.test
 share/mysql/test/suite/x/t/killconnection.test
+share/mysql/test/suite/x/t/macros/assert_status_variable.macro
 share/mysql/test/suite/x/t/message_empty_payload.test
 share/mysql/test/suite/x/t/message_protobuf_nested-master.opt
 share/mysql/test/suite/x/t/message_protobuf_nested.test
@@ -12845,6 +12916,7 @@ share/mysql/test/suite/x/t/session_reset.test
 share/mysql/test/suite/x/t/status_bytes_received.test
 share/mysql/test/suite/x/t/status_variable_errors_unknown_message_type-master.opt
 share/mysql/test/suite/x/t/status_variable_errors_unknown_message_type.test
+share/mysql/test/suite/x/t/status_variable_notices.test
 share/mysql/test/suite/x/t/status_variables-master.opt
 share/mysql/test/suite/x/t/status_variables.test
 share/mysql/test/suite/x/t/status_variables_incrementing.test
@@ -13149,6 +13221,7 @@ share/mysql/test/t/func_encrypt.test
 share/mysql/test/t/func_encrypt_nossl.test
 share/mysql/test/t/func_encrypt_ucs2.test
 share/mysql/test/t/func_equal.test
+share/mysql/test/t/func_found_rows.test
 share/mysql/test/t/func_gconcat.test
 share/mysql/test/t/func_group.test
 share/mysql/test/t/func_group_innodb.test
@@ -13497,6 +13570,7 @@ share/mysql/test/t/mysqldump-no-binlog-master.opt
 share/mysql/test/t/mysqldump-no-binlog.test
 share/mysql/test/t/mysqldump.test
 share/mysql/test/t/mysqldump_restore.test
+share/mysql/test/t/mysqldumpslow.test
 share/mysql/test/t/mysqlimport.test
 share/mysql/test/t/mysqlpump.test
 share/mysql/test/t/mysqlpump_basic.test
@@ -13542,6 +13616,7 @@ share/mysql/test/t/odbc.test
 share/mysql/test/t/olap.test
 share/mysql/test/t/openssl_1.test
 share/mysql/test/t/opt_costmodel.test
+share/mysql/test/t/opt_costmodel_downgrade.test
 share/mysql/test/t/opt_costmodel_flush.test
 share/mysql/test/t/opt_costmodel_pfs.test
 share/mysql/test/t/opt_costmodel_restart.test