pkgsrc-WIP-changes archive

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

Update mysql80-client and mysql80-server to latest version 8.0.24



Module Name:	pkgsrc-wip
Committed By:	Jaromir Dolecek <jdolecek%NetBSD.org@localhost>
Pushed By:	jdolecek
Date:		Thu May 13 00:34:58 2021 +0200
Changeset:	36a2a30ee7ce6a9abeaf2256d584bc4658857e91

Modified Files:
	mysql80-client/Makefile
	mysql80-client/Makefile.common
	mysql80-client/PLIST
	mysql80-client/TODO
	mysql80-client/buildlink3.mk
	mysql80-client/distinfo
	mysql80-client/patches/patch-client_CMakeLists.txt
	mysql80-client/patches/patch-cmake_boost.cmake
	mysql80-client/patches/patch-config.h.cmake
	mysql80-client/patches/patch-configure.cmake
	mysql80-client/patches/patch-libmysql_CMakeLists.txt
	mysql80-client/patches/patch-mysys_kqueue__timers.cc
	mysql80-client/patches/patch-scripts_CMakeLists.txt
	mysql80-client/patches/patch-sql_CMakeLists.txt
	mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc
	mysql80-client/patches/patch-vio_viosocket.cc
	mysql80-server/Makefile
	mysql80-server/PLIST
Added Files:
	mysql80-client/MESSAGE
	mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h
	mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_internet.h
	mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_local.h
	mysql80-client/patches/patch-router_src_harness_src_stdx_io_file_handle.cc
	mysql80-client/patches/patch-sql_item_geofunc_relchecks_bgwrap.h
Removed Files:
	mysql80-client/patches/patch-extra_libedit_chartype.h
	mysql80-client/patches/patch-extra_libedit_vi.c
	mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake
	mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c
	mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c
	mysql80-client/patches/patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh

Log Message:
Update mysql80-client and mysql80-server to latest version 8.0.24

Primary driver is lack of distfile for 8.0.19, changes too many to list.

XXX Currently this forces dependency on obsolete boost-lib 1.73, mysql
XXX doesn't build with the newer version 1.76 in pkgsrc.

Specific package fixes:
- utf8mb4 is the default charset
- removed unnecessary workaround for NetBSD builtin editline
- added workaround for <alloca.h> dependency for NetBSD
- use EVFILT_USER on newer NetBSD which has it

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=36a2a30ee7ce6a9abeaf2256d584bc4658857e91

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

diffstat:
 mysql80-client/MESSAGE                             |    5 +
 mysql80-client/Makefile                            |    2 +-
 mysql80-client/Makefile.common                     |   27 +-
 mysql80-client/PLIST                               |    3 +-
 mysql80-client/TODO                                |    6 +-
 mysql80-client/buildlink3.mk                       |    1 +
 mysql80-client/distinfo                            |   39 +-
 mysql80-client/patches/patch-client_CMakeLists.txt |   21 +-
 mysql80-client/patches/patch-cmake_boost.cmake     |   19 +-
 mysql80-client/patches/patch-config.h.cmake        |    8 +-
 mysql80-client/patches/patch-configure.cmake       |   11 +-
 .../patches/patch-extra_libedit_chartype.h         |   16 -
 mysql80-client/patches/patch-extra_libedit_vi.c    |   24 -
 .../patches/patch-libmysql_CMakeLists.txt          |   20 +-
 .../patches/patch-mysys_kqueue__timers.cc          |   19 +-
 ...gin_group__replication_libmysqlgcs_rpcgen.cmake |   20 -
 ...bmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c |   21 -
 ...sqlgcs_src_bindings_xcom_xcom_xcom__transport.c |   30 -
 ...rness_include_mysql_harness_net_ts_impl_netif.h |   15 +
 ...harness_include_mysql_harness_net_ts_internet.h |   19 +
 ...rc_harness_include_mysql_harness_net_ts_local.h |   24 +
 ...h-router_src_harness_src_stdx_io_file_handle.cc |   28 +
 .../patches/patch-scripts_CMakeLists.txt           |   31 +-
 mysql80-client/patches/patch-sql_CMakeLists.txt    |    8 +-
 .../patch-sql_item_geofunc_relchecks_bgwrap.h      |   15 +
 ...rcegroups_platform_thread__attrs__api__apple.cc |   36 +-
 ...b_mcc_frontend_dojo_dojox_mobile_build_build.sh |   19 -
 mysql80-client/patches/patch-vio_viosocket.cc      |   10 +-
 mysql80-server/Makefile                            |   11 +-
 mysql80-server/PLIST                               | 1973 ++++++++++++++++++--
 30 files changed, 2032 insertions(+), 449 deletions(-)

diffs:
diff --git a/mysql80-client/MESSAGE b/mysql80-client/MESSAGE
new file mode 100644
index 0000000000..c965b8abd2
--- /dev/null
+++ b/mysql80-client/MESSAGE
@@ -0,0 +1,5 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2021/05/08 19:47:16 jdolecek Exp $
+
+This package is EXPERIMENTAL for now, recommend to only use for testing.
+===========================================================================
diff --git a/mysql80-client/Makefile b/mysql80-client/Makefile
index ceccb8d5d1..1529bcc886 100644
--- a/mysql80-client/Makefile
+++ b/mysql80-client/Makefile
@@ -3,7 +3,7 @@
 PKGNAME=	${DISTNAME:S/-/-client-/}
 COMMENT=	MySQL 8, a free SQL database (client)
 
-CONFLICTS=	mysql3-client-[0-9]*
+CONFLICTS=	mysql3-client-[0-9]* mariadb-client-[0-9]*
 
 .include "Makefile.common"
 
diff --git a/mysql80-client/Makefile.common b/mysql80-client/Makefile.common
index 3bfe41f8f9..be46a72762 100644
--- a/mysql80-client/Makefile.common
+++ b/mysql80-client/Makefile.common
@@ -3,7 +3,7 @@
 # used by wip/mysql80-client/Makefile
 # used by wip/mysql80-server/Makefile
 
-DISTNAME=	mysql-8.0.19
+DISTNAME=	mysql-8.0.24
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL:=MySQL-8.0/}
 
@@ -13,9 +13,14 @@ LICENSE=	gnu-gpl-v2
 
 DISTINFO_FILE?=	${.CURDIR}/../../wip/mysql80-client/distinfo
 PATCHDIR?=	${.CURDIR}/../../wip/mysql80-client/patches
+MESSAGE_SRC+=	${.CURDIR}/../../databases/mariadb104-client/MESSAGE
+
+BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.11
+# XXX requires boost-lib 1.73, doesn't compile with 1.76
+BUILDLINK_API_DEPENDS.boost-libs+=      boost-libs-1.73.*
 
 USE_CMAKE=		yes
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++ c++14 # 1.75+ boost requires c++14
 USE_TOOLS+=		bash bison gmake perl:run
 USE_GCC_RUNTIME=	yes
 USE_BUILTIN.libevent=	no
@@ -34,8 +39,8 @@ MYSQL_USER?=		mysql
 MYSQL_GROUP?=		mysql
 MYSQL_DATADIR?=		${VARBASE}/mysql
 MYSQL_PIDFILE?=		${MYSQL_DATADIR}/${HOST}.pid
-MYSQL_CHARSET?=		latin1
-MYSQL_COLLATION?=	latin1_swedish_ci
+MYSQL_CHARSET?=		utf8mb4
+MYSQL_COLLATION?=	utf8mb4_unicode_ci
 MYSQL_EXTRA_CHARSET?=	all
 
 PKG_USERS_VARS+=	MYSQL_USER
@@ -58,6 +63,7 @@ CMAKE_ARGS+=		-DINSTALL_MYSQLTESTDIR="share/mysql/test"
 CMAKE_ARGS+=		-DINSTALL_PLUGINDIR="lib/mysql/plugin"
 CMAKE_ARGS+=		-DINSTALL_SBINDIR="sbin"
 CMAKE_ARGS+=		-DINSTALL_SUPPORTFILESDIR="share/mysql"
+CMAKE_ARGS+=		-DROUTER_INSTALL_LOGROTATEDIR="share/mysql"
 CMAKE_ARGS+=		-DMYSQL_DATADIR=${MYSQL_DATADIR}
 
 CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
@@ -118,14 +124,17 @@ SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_SED.scr+=		-e "s,@SHELL_PATH@,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
-# Don't use the base system "libedit" under NetBSD because MySQL expects
-# an incompatible prototype for "rl_completion_entry_function".
+CMAKE_ARGS+=		-DWITH_EDITLINE="system"
+CMAKE_ARGS+=		-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editline}/${BUILDLINK_INCDIRS.editline}
+
 .if ${OPSYS} == "NetBSD"
-USE_BUILTIN.editline=	no
+CFLAGS.NetBSD+=		-DHAVE_ALLOCA_H
+CXXFLAGS.NetBSD+=	-DHAVE_ALLOCA_H
+# MySQL code depends on having <alloca.h>
+post-patch:
+	echo "#define alloca(sz) __builtin_alloca(sz)" > ${WRKSRC}/include/alloca.h
 .endif
 
-CMAKE_ARGS+=		-DWITH_EDITLINE="system"
-
 .include "../../mk/curses.buildlink3.mk"
 .include "../../archivers/lz4/buildlink3.mk"
 .include "../../archivers/zstd/buildlink3.mk"
diff --git a/mysql80-client/PLIST b/mysql80-client/PLIST
index 0469a97bae..cb359821f2 100644
--- a/mysql80-client/PLIST
+++ b/mysql80-client/PLIST
@@ -3,6 +3,7 @@ bin/mysql
 bin/mysql_client_test
 bin/mysql_config
 bin/mysql_config_editor
+bin/mysql_migrate_keyring
 bin/mysql_ssl_rsa_setup
 bin/mysqladmin
 bin/mysqlbinlog
@@ -28,7 +29,7 @@ include/mysql/mysqld_error.h
 lib/libmysqlclient.a
 lib/libmysqlclient.so
 lib/libmysqlclient.so.21
-lib/libmysqlclient.so.21.1.19
+lib/libmysqlclient.so.21.1.24
 lib/pkgconfig/mysqlclient.pc
 man/man1/comp_err.1
 man/man1/ibd2sdi.1
diff --git a/mysql80-client/TODO b/mysql80-client/TODO
index 092cc52286..104168db8b 100644
--- a/mysql80-client/TODO
+++ b/mysql80-client/TODO
@@ -1,4 +1,4 @@
-fix va_start warnings
-fix alloca warnings
-is kqueue_timers.cc really working correctly without EVFILT_USER ?
 perhaps implement thread affinity for netbsd and irix
+
+server:
+requires boost-lib 1.73, doesn't compile with 1.76.0
diff --git a/mysql80-client/buildlink3.mk b/mysql80-client/buildlink3.mk
index 22cdd61092..d29ff25911 100644
--- a/mysql80-client/buildlink3.mk
+++ b/mysql80-client/buildlink3.mk
@@ -11,6 +11,7 @@ BUILDLINK_INCDIRS.mysql-client?=	include/mysql
 BUILDLINK_LIBDIRS.mysql-client?=	lib
 
 .include "../../devel/libevent/buildlink3.mk"
+.include "../../archivers/zstd/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif # MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/mysql80-client/distinfo b/mysql80-client/distinfo
index 57110982f7..336e028987 100644
--- a/mysql80-client/distinfo
+++ b/mysql80-client/distinfo
@@ -1,37 +1,36 @@
 $NetBSD: distinfo,v 1.35 2019/12/06 14:05:11 jperkin Exp $
 
-SHA1 (mysql-8.0.19.tar.gz) = 97fde10d454379e7fe2f16f8e9cd54678130a072
-RMD160 (mysql-8.0.19.tar.gz) = 95e609d2180269815796a91abe41b8a22ab41846
-SHA512 (mysql-8.0.19.tar.gz) = d76d20461f28848081e8c9c738cb8f38d69de5dd18f92ee6a70f7c556a7ad5b9828dc850293c5a3347321cae0340e150ad95292a3bf867ab4cfe66e5022c5eb9
-Size (mysql-8.0.19.tar.gz) = 266717983 bytes
+SHA1 (mysql-8.0.24.tar.gz) = ad9789c74d08092a5cf95de56de2dd1947e8d873
+RMD160 (mysql-8.0.24.tar.gz) = 6472fe5880efc656f90367bef12ecd3a24ae6923
+SHA512 (mysql-8.0.24.tar.gz) = 7bf1143c7e48d6541e78f1a92138f9dc64f43243cb28975aa7ad4b8ac2c9dea2b664261bc2726fd5bddec294f879f7ac517a3a62c8f1c39ec37fe39ec51e5f48
+Size (mysql-8.0.24.tar.gz) = 283589702 bytes
 SHA1 (patch-CMakeLists.txt) = 16ca9bcbcaefdc8bd1bc0e8dc89ca7a347d14675
-SHA1 (patch-client_CMakeLists.txt) = fc937a1e096c91695231fe98783ca5fb8425f78e
+SHA1 (patch-client_CMakeLists.txt) = f96d0d2e5ad8c1c8f5d6a9eabbd1c706bee852c0
 SHA1 (patch-client_mysqladmin.cc) = e3459bd009ef7ac0b7acece6bbcb82777a384db3
-SHA1 (patch-cmake_boost.cmake) = 39ac27f5b9ae9c3f115b6b331703eb121e2abfb7
+SHA1 (patch-cmake_boost.cmake) = 7452d5ef84c63bb0bd34313aa0cedafee5f41618
 SHA1 (patch-cmake_os_SunOS.cmake) = 15cf67c136c2b6e608d9379290d235d71d6b769e
 SHA1 (patch-cmake_readline.cmake) = fb79ed969240ae2984098f72c2d3fb501154902c
-SHA1 (patch-config.h.cmake) = 4d5f65f59a3693424e783c4a30ec36819e03e708
-SHA1 (patch-configure.cmake) = b219f4f42ecc27b06c4036d28fe0346dbbec1c4a
-SHA1 (patch-extra_libedit_chartype.h) = 84d90134a684923df29c04ef0c636d49c17b85bf
-SHA1 (patch-extra_libedit_vi.c) = 6bf4f527f59386e09164cd01d676684daa9629eb
+SHA1 (patch-config.h.cmake) = e6debea316c5bb8338afb693d704007d45b3941f
+SHA1 (patch-configure.cmake) = 659b93e5a1eeaf32a2937b8201050d34e83f6b5d
 SHA1 (patch-include_CMakeLists.txt) = 289c1454d1b7e7fe8566187b3cefc722260993b6
 SHA1 (patch-include_my__compare.h) = e6b3146252d1ebf2e2423ed3682621aa68cce6bd
 SHA1 (patch-include_my__thread.h) = 176134a238c5c2f983aadb6d1cd620165f4057bb
 SHA1 (patch-include_my__thread__os__id.h) = 383923523623d0811915d5d75c523904102dcf43
 SHA1 (patch-include_tables__contained__in.h) = c332b10760ef8b7f16b1e94821b79589f525e4e7
-SHA1 (patch-libmysql_CMakeLists.txt) = 0ad668d788eedb8248e26cacfb097242308b8cd2
-SHA1 (patch-mysys_kqueue__timers.cc) = 511a9a52112d09a067191109caa7220baa42c73e
+SHA1 (patch-libmysql_CMakeLists.txt) = c46b0091aaebe91da89b2a8fb70398965d417664
+SHA1 (patch-mysys_kqueue__timers.cc) = 837474b779c24dd0af67444c2adbcf07b73e0d36
 SHA1 (patch-mysys_stacktrace.cc) = 6792ceaae3c3b0d70bd8b6c848a128d50397e6f4
-SHA1 (patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake) = 0a4177ea5ad24bc0469dd2bf196f57943f1686d8
-SHA1 (patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c) = f56bde286a5da53975aacd5227ab3a1be00ddde0
-SHA1 (patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c) = 11805653556a0129e8f064e824087525b5909109
 SHA1 (patch-router_CMakeLists.txt) = 9bfd1278c42070ada0606dfff34a66b8b95d0413
+SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h) = 4daf0b2a9e92eb6ffe8a00eb0bfb37db7a8638ee
+SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_internet.h) = 29e019236423aaa77b71b273d009404e4fbafe73
+SHA1 (patch-router_src_harness_include_mysql_harness_net_ts_local.h) = d2149f9840dc8b65a4d9d8332bcd5088b4f9b919
 SHA1 (patch-router_src_harness_include_mysql_harness_tty.h) = ca883b2ed83b623922b58cf96f896de9847d37cb
-SHA1 (patch-scripts_CMakeLists.txt) = e8399d75331795f4ad0c7138d5850eab1bbc34ca
+SHA1 (patch-router_src_harness_src_stdx_io_file_handle.cc) = 0004dfb6a65b8774096ad58825ab5fa04858e6bf
+SHA1 (patch-scripts_CMakeLists.txt) = 15be14619275f0dc39c216901b2cabc6ee517300
 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b
-SHA1 (patch-sql_CMakeLists.txt) = c05cdca38e7538ff58ab0ee74bdaebe73f68e1a2
+SHA1 (patch-sql_CMakeLists.txt) = 84af2f2e58a17bde292a665a726489b8f56f4132
 SHA1 (patch-sql_conn__handler_socket__connection.cc) = b414e0d499f51750e1aa6e9dd7b4e7006456a079
-SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc) = b82e9f0e41bd380dab33c82705960f3f85985c31
+SHA1 (patch-sql_item_geofunc_relchecks_bgwrap.h) = d20896bfe2391d30aa9e95834c77e7de03377d76
+SHA1 (patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc) = e08ed53790ac8b03b38d566fee3a2688ca6065b3
 SHA1 (patch-storage_ndb_include_ndb__global.h) = 03adf28cbd965869a0e8ea312ae719d7772e63da
-SHA1 (patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh) = a7b6597dce68b848fbfe1d1da3d6d385cf0b7f4e
-SHA1 (patch-vio_viosocket.cc) = 0f70ce1167ba2cd6ec22efbcfaaee7de0f0f816e
+SHA1 (patch-vio_viosocket.cc) = 76dfaf9c8feb39fc3043cfd83d51a47aa8a8352d
diff --git a/mysql80-client/patches/patch-client_CMakeLists.txt b/mysql80-client/patches/patch-client_CMakeLists.txt
index e057755c75..b9dadbde09 100644
--- a/mysql80-client/patches/patch-client_CMakeLists.txt
+++ b/mysql80-client/patches/patch-client_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-client_CMakeLists.txt,v 1.3 2019/10/14 20:19:29 adam Exp $
+$NetBSD$
 
 Split configuration between mysql-client and mysql-server.
 
---- client/CMakeLists.txt.orig	2019-12-09 19:53:17.000000000 +0000
+--- client/CMakeLists.txt.orig	2021-05-08 21:52:13.000000000 +0000
 +++ client/CMakeLists.txt
 @@ -28,6 +28,7 @@ DISABLE_MISSING_PROFILE_WARNING()
  ## Subdirectory with common client code.
@@ -10,17 +10,17 @@ Split configuration between mysql-client and mysql-server.
  ## Subdirectory for mysqlpump code.
 +IF(WITHOUT_SERVER)
  ADD_SUBDIRECTORY(dump)
- 
- MYSQL_ADD_EXECUTABLE(mysql
-@@ -38,6 +39,7 @@ MYSQL_ADD_EXECUTABLE(mysql
-   readline.cc
+ ## Subdirectory for mysql_migrate_keyring code.
+ ADD_SUBDIRECTORY(migrate_keyring)
+@@ -41,6 +42,7 @@ MYSQL_ADD_EXECUTABLE(mysql
+   client_query_attributes.cc
    LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY}
    )
 +ENDIF()
  
  IF(NOT WITHOUT_SERVER)
    MYSQL_ADD_EXECUTABLE(mysql_upgrade
-@@ -53,6 +55,7 @@ IF(SOLARIS_SPARC AND CMAKE_BUILD_TYPE_UP
+@@ -57,6 +59,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNP
      )
  ENDIF()
  
@@ -28,7 +28,7 @@ Split configuration between mysql-client and mysql-server.
  MYSQL_ADD_EXECUTABLE(mysqltest
    mysqltest.cc
    mysqltest/error_names.cc
-@@ -68,6 +71,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest
+@@ -73,6 +76,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest
    ENABLE_EXPORTS
    LINK_LIBRARIES mysqlclient
    )
@@ -36,7 +36,7 @@ Split configuration between mysql-client and mysql-server.
  MYSQL_ADD_EXECUTABLE(mysqlcheck
    check/mysqlcheck.cc
    check/mysqlcheck_core.cc
-@@ -123,17 +127,20 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
+@@ -261,16 +265,20 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
    mysql_config_editor.cc
    LINK_LIBRARIES mysqlclient
    )
@@ -53,8 +53,7 @@ Split configuration between mysql-client and mysql-server.
    path.cc
    LINK_LIBRARIES mysys
    )
--
 +ENDIF()
+ 
  # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
  IF(WIN32)
-   MYSQL_ADD_EXECUTABLE(echo echo.cc)
diff --git a/mysql80-client/patches/patch-cmake_boost.cmake b/mysql80-client/patches/patch-cmake_boost.cmake
index f48555bcab..42530af4c0 100644
--- a/mysql80-client/patches/patch-cmake_boost.cmake
+++ b/mysql80-client/patches/patch-cmake_boost.cmake
@@ -2,22 +2,19 @@ $NetBSD$
 
 Allow newer boost.
 
---- cmake/boost.cmake.orig	2019-12-09 19:53:17.000000000 +0000
+--- cmake/boost.cmake.orig	2021-03-22 08:44:50.000000000 +0000
 +++ cmake/boost.cmake
-@@ -293,16 +293,6 @@ STRING(REGEX REPLACE
+@@ -300,13 +300,6 @@ IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
+   COULD_NOT_FIND_BOOST()
+ ENDIF()
  
- MESSAGE(STATUS "BOOST_VERSION_NUMBER is ${BOOST_VERSION_NUMBER}")
- 
--IF(NOT BOOST_MAJOR_VERSION EQUAL 10)
--  COULD_NOT_FIND_BOOST()
--ENDIF()
--
--IF(NOT BOOST_MINOR_VERSION EQUAL 70)
+-IF(NOT BOOST_MINOR_VERSION EQUAL 73)
 -  MESSAGE(WARNING "Boost minor version found is ${BOOST_MINOR_VERSION} "
--    "we need 70"
+-    "we need 73"
 -    )
 -  COULD_NOT_FIND_BOOST()
 -ENDIF()
- 
+-
  MESSAGE(STATUS "BOOST_INCLUDE_DIR ${BOOST_INCLUDE_DIR}")
  
+ # We have a limited set of patches/bugfixes here:
diff --git a/mysql80-client/patches/patch-config.h.cmake b/mysql80-client/patches/patch-config.h.cmake
index af8be84814..9c9e3cb772 100644
--- a/mysql80-client/patches/patch-config.h.cmake
+++ b/mysql80-client/patches/patch-config.h.cmake
@@ -4,9 +4,9 @@ $NetBSD$
 * check for ffsll and provide a portable version for sytems that
   don't have it.
 
---- config.h.cmake.orig	2019-12-09 19:53:17.000000000 +0000
+--- config.h.cmake.orig	2021-03-22 08:44:50.000000000 +0000
 +++ config.h.cmake
-@@ -41,6 +41,7 @@
+@@ -40,6 +40,7 @@
  /* Header files */
  #cmakedefine HAVE_ALLOCA_H 1
  #cmakedefine HAVE_ARPA_INET_H 1
@@ -14,11 +14,11 @@ $NetBSD$
  #cmakedefine HAVE_DLFCN_H 1
  #cmakedefine HAVE_EXECINFO_H 1
  #cmakedefine HAVE_FPU_CONTROL_H 1
-@@ -90,6 +91,7 @@
+@@ -80,6 +81,7 @@
  #cmakedefine HAVE_FDATASYNC 1
  #cmakedefine HAVE_DECL_FDATASYNC 1
  #cmakedefine HAVE_FEDISABLEEXCEPT 1
 +#cmakedefine HAVE_FFSLL 1
  #cmakedefine HAVE_FSYNC 1
  #cmakedefine HAVE_GETHRTIME 1
- #cmakedefine HAVE_GETNAMEINFO 1
+ #cmakedefine HAVE_GETPASS 1
diff --git a/mysql80-client/patches/patch-configure.cmake b/mysql80-client/patches/patch-configure.cmake
index 0b3167a5cd..f6d74f4a1f 100644
--- a/mysql80-client/patches/patch-configure.cmake
+++ b/mysql80-client/patches/patch-configure.cmake
@@ -1,11 +1,12 @@
 $NetBSD$
 
-* bstring.h is need for bzero on some platforms
 * check for ffsll and provide a portable version if not found
 
---- configure.cmake.orig	2019-12-09 19:53:17.000000000 +0000
+$NetBSD$
+
+--- configure.cmake.orig	2021-03-22 08:44:50.000000000 +0000
 +++ configure.cmake
-@@ -199,13 +199,9 @@ ENDIF()
+@@ -186,13 +186,9 @@ ENDIF()
  #
  INCLUDE (CheckIncludeFiles)
  
@@ -20,11 +21,11 @@ $NetBSD$
  CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
  CHECK_INCLUDE_FILES (endian.h HAVE_ENDIAN_H)
  CHECK_INCLUDE_FILES (execinfo.h HAVE_EXECINFO_H)
-@@ -269,6 +265,7 @@ CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
+@@ -241,6 +237,7 @@ CHECK_FUNCTION_EXISTS (fcntl HAVE_FCNTL)
  CHECK_FUNCTION_EXISTS (fdatasync HAVE_FDATASYNC)
  CHECK_SYMBOL_EXISTS(fdatasync "unistd.h" HAVE_DECL_FDATASYNC)
  CHECK_FUNCTION_EXISTS (fedisableexcept HAVE_FEDISABLEEXCEPT)
 +CHECK_FUNCTION_EXISTS (ffsll HAVE_FFSLL)
  CHECK_FUNCTION_EXISTS (fsync HAVE_FSYNC)
  CHECK_FUNCTION_EXISTS (gethrtime HAVE_GETHRTIME)
- CHECK_FUNCTION_EXISTS (getnameinfo HAVE_GETNAMEINFO)
+ CHECK_FUNCTION_EXISTS (getpass HAVE_GETPASS)
diff --git a/mysql80-client/patches/patch-extra_libedit_chartype.h b/mysql80-client/patches/patch-extra_libedit_chartype.h
deleted file mode 100644
index f18f267568..0000000000
--- a/mysql80-client/patches/patch-extra_libedit_chartype.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-Exclude DragonFly & OpenBSD
-
---- extra/libedit/chartype.h.orig	2019-12-09 19:53:17.000000000 +0000
-+++ extra/libedit/chartype.h
-@@ -49,7 +49,8 @@
-   TODO : Verify if FreeBSD & AIX stores ISO 10646 in wchar_t. */
- #if !defined(__NetBSD__) && !defined(__sun) \
-   && !(defined(__APPLE__) && defined(__MACH__)) \
--  && !defined(__FreeBSD__) && !defined(_AIX)
-+  && !defined(__FreeBSD__) && !defined(_AIX) \
-+  && !defined(__DragonFly__) && !defined(__OpenBSD__)
- #ifndef __STDC_ISO_10646__
- /* In many places it is assumed that the first 127 code points are ASCII
-  * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
diff --git a/mysql80-client/patches/patch-extra_libedit_vi.c b/mysql80-client/patches/patch-extra_libedit_vi.c
deleted file mode 100644
index 418a4294d0..0000000000
--- a/mysql80-client/patches/patch-extra_libedit_vi.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-DragonFly BSD build fix
-
---- extra/libedit/vi.c.orig	2019-12-09 19:53:17.000000000 +0000
-+++ extra/libedit/vi.c
-@@ -919,7 +919,7 @@ vi_comment_out(EditLine *el, Int c __att
-  * NB: posix implies that we should enter insert mode, however
-  * this is against historical precedent...
-  */
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -928,7 +928,7 @@ protected el_action_t
- vi_alias(EditLine *el __attribute__((__unused__)),
- 	 Int c __attribute__((__unused__)))
- {
--#if defined(__weak_reference) && !defined(__FreeBSD__)
-+#if defined(__weak_reference) && !defined(__FreeBSD__) && !defined(__DragonFly__)
- 	char alias_name[3];
- 	char *alias_text;
- 
diff --git a/mysql80-client/patches/patch-libmysql_CMakeLists.txt b/mysql80-client/patches/patch-libmysql_CMakeLists.txt
index ce1159921b..4c3e0fd7a6 100644
--- a/mysql80-client/patches/patch-libmysql_CMakeLists.txt
+++ b/mysql80-client/patches/patch-libmysql_CMakeLists.txt
@@ -4,17 +4,15 @@ 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	2019-12-09 19:53:17.000000000 +0000
+--- libmysql/CMakeLists.txt.orig	2021-03-22 08:44:50.000000000 +0000
 +++ libmysql/CMakeLists.txt
-@@ -241,13 +241,13 @@ IF(WIN32)
-   ADD_SUBDIRECTORY(authentication_win)
+@@ -270,11 +270,12 @@ IF(WIN32)
    LIST(APPEND LIBS_TO_MERGE auth_win_client)
  ENDIF()
--
+ 
 -# LDAP authentication SASL client plugin
--MESSAGE(STATUS "Creating LDAP authentication SASL client library.")
 -ADD_SUBDIRECTORY(authentication_ldap)
-   
+-
  # Merge several convenience libraries into one big mysqlclient
 +IF(WITHOUT_SERVER)
  MERGE_CONVENIENCE_LIBRARIES(mysqlclient ${LIBS_TO_MERGE} COMPONENT Development)
@@ -24,7 +22,7 @@ authentication_ldap and libmysql_api_test require libmysqld.
  TARGET_LINK_LIBRARIES(mysqlclient PRIVATE ${LIBS_TO_LINK})
  
  # Visual Studio users need debug  static library for debug projects
-@@ -283,12 +283,21 @@ ENDIF()
+@@ -310,12 +311,21 @@ ENDIF()
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -45,8 +43,8 @@ authentication_ldap and libmysql_api_test require libmysqld.
 +ENDIF()
  TARGET_LINK_LIBRARIES(libmysql PRIVATE ${LIBS_TO_LINK})
  
- IF(WIN32)
-@@ -302,7 +311,7 @@ ENDIF()
+ IF(LINUX_STANDALONE AND KERBEROS_CUSTOM_LIBRARY)
+@@ -334,7 +344,7 @@ ENDIF()
  
  IF(UNIX)
    # libtool compatability
@@ -55,7 +53,7 @@ authentication_ldap and libmysql_api_test require libmysqld.
      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}")
    ELSE()
      SET(OS_SHARED_LIB_VERSION
-@@ -366,6 +375,7 @@ CONFIGURE_FILE(api_test.c.in ${CMAKE_CUR
+@@ -397,6 +407,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.
  #
@@ -63,7 +61,7 @@ authentication_ldap and libmysql_api_test require libmysqld.
  MYSQL_ADD_EXECUTABLE(libmysql_api_test
    ${CMAKE_CURRENT_BINARY_DIR}/api_test.c
    LINK_LIBRARIES libmysql ${LIBRT}
-@@ -386,3 +396,4 @@ ADD_CUSTOM_COMMAND(TARGET libmysql_api_t
+@@ -425,3 +436,4 @@ ADD_CUSTOM_COMMAND(TARGET libmysql_api_t
    COMMAND libmysql_api_test
    > ${CMAKE_CURRENT_BINARY_DIR}/libmysql_api_test.out
    )
diff --git a/mysql80-client/patches/patch-mysys_kqueue__timers.cc b/mysql80-client/patches/patch-mysys_kqueue__timers.cc
index a8d3c3e973..309688aac6 100644
--- a/mysql80-client/patches/patch-mysys_kqueue__timers.cc
+++ b/mysql80-client/patches/patch-mysys_kqueue__timers.cc
@@ -3,7 +3,7 @@ $NetBSD$
 * support pre NetBSD 10 __intptr_t udata type
 * Fix for systems whcich do not define EVFILT_USER
 
---- mysys/kqueue_timers.cc.orig	2019-12-09 19:53:17.000000000 +0000
+--- mysys/kqueue_timers.cc.orig	2021-03-22 08:44:50.000000000 +0000
 +++ mysys/kqueue_timers.cc
 @@ -40,6 +40,18 @@
  #include "mysys_err.h"
@@ -24,24 +24,21 @@ $NetBSD$
  /* Kernel event queue file descriptor. */
  static int kq_fd = -1;
  
-@@ -69,11 +81,14 @@ static void *timer_notify_thread_func(vo
+@@ -69,10 +81,12 @@ static void *timer_notify_thread_func(vo
      }
  
      if (kev.filter == EVFILT_TIMER) {
 -      timer = static_cast<my_timer_t *>(kev.udata);
 +      timer = static_cast<my_timer_t *>((void *)kev.udata);
-       DBUG_ASSERT(timer->id == kev.ident);
+       assert(timer->id == kev.ident);
        timer->notify_function(timer);
--    } else if (kev.filter == EVFILT_USER)
-+    }
 +#ifdef EVFILT_USER
-+      else if (kev.filter == EVFILT_USER)
-       break;
+     } else if (kev.filter == EVFILT_USER)
 +#endif
+       break;
    }
  
-   close(kq_fd);
-@@ -91,7 +106,9 @@ static void *timer_notify_thread_func(vo
+@@ -91,7 +105,9 @@ static void *timer_notify_thread_func(vo
  static int start_helper_thread(void) {
    struct kevent kev;
  
@@ -51,7 +48,7 @@ $NetBSD$
  
    if (kevent(kq_fd, &kev, 1, NULL, 0, NULL) < 0) {
      my_message_local(ERROR_LEVEL, EE_FAILED_TO_CREATE_TIMER, errno);
-@@ -134,7 +151,9 @@ int my_timer_initialize(void) {
+@@ -134,7 +150,9 @@ int my_timer_initialize(void) {
  void my_timer_deinitialize(void) {
    struct kevent kev;
  
@@ -61,7 +58,7 @@ $NetBSD$
  
    if (kevent(kq_fd, &kev, 1, NULL, 0, NULL) < 0)
      my_message_local(ERROR_LEVEL,
-@@ -174,7 +193,7 @@ int my_timer_create(my_timer_t *timer) {
+@@ -165,7 +183,7 @@ int my_timer_create(my_timer_t *timer) {
  int my_timer_set(my_timer_t *timer, unsigned long time) {
    struct kevent kev;
  
diff --git a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake b/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake
deleted file mode 100644
index a2b95e6093..0000000000
--- a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_rpcgen.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
-Don't depend on rpcgen, just use the pre-generated headers
-
---- plugin/group_replication/libmysqlgcs/rpcgen.cmake.orig	2019-12-09 19:53:17.000000000 +0000
-+++ plugin/group_replication/libmysqlgcs/rpcgen.cmake
-@@ -71,7 +71,12 @@ FOREACH(X xcom_vp)
-   SET (x_vanilla_h      ${XCOM_BASEDIR}/${X}.h.gen)
-   SET (x_vanilla_c      ${XCOM_BASEDIR}/${X}_xdr.c.gen)
- 
--  IF(WIN32)
-+  IF(1)
-+    IF(RPC_INCLUDE_DIR STREQUAL "/usr/include/tirpc")
-+      INCLUDE_DIRECTORIES(SYSTEM /usr/include/tirpc)
-+      ADD_DEFINITIONS(-DHAVE_TIRPC)
-+      SET(TIRPC_LIBRARY tirpc)
-+    ENDIF()
-     # on windows system's there is no rpcgen, thence copy
-     # the files in the source directory
-     ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c} ${x_tmp_plat_h}
diff --git a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c b/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c
deleted file mode 100644
index b33b8e4af4..0000000000
--- a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__memory.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD$
-
-workaround netbsd prototype of xdrproc_t being 2 arguments.
-
---- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c.orig	2019-12-09 19:53:17.000000000 +0000
-+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_memory.c
-@@ -50,7 +50,14 @@ void my_xdr_free(xdrproc_t proc, char *o
-     is the case). This will keep this code cross-platform
-     and cross-version compatible.
-   */
-+#ifdef __NetBSD__
-+  /* NetBSD doesn't have variadic xdrproc_t...
-+   * see https://bugzilla.redhat.com/show_bug.cgi?is=1128820#c24
-+   * for a similar problem */
-+  (*proc)(&x, objp);
-+#else
-   (*proc)(&x, objp, 0);
-+#endif
- }
- 
- void xcom_xdr_free(xdrproc_t f, char *p) {
diff --git a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c b/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c
deleted file mode 100644
index ecf89ae5d2..0000000000
--- a/mysql80-client/patches/patch-plugin_group__replication_libmysqlgcs_src_bindings_xcom_xcom_xcom__transport.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD$
-
-workaround netbsd prototype of xdrproc_t being 2 arguments.
-
---- plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c.orig	2019-12-09 19:53:17.000000000 +0000
-+++ plugin/group_replication/libmysqlgcs/src/bindings/xcom/xcom/xcom_transport.c
-@@ -383,7 +383,11 @@ int apply_xdr(xcom_proto x_proto, void *
-   if (xdr.x_ops) {
-     xdr.x_public =
-         (caddr_t)&x_proto; /* Supply protocol version in user field of xdr */
-+#ifdef __NetBSD__
-+    s = xdrfunc(&xdr, xdrdata);
-+#else
-     s = xdrfunc(&xdr, xdrdata, 0);
-+#endif
-   }
-   xdr_destroy(&xdr);
-   return s;
-@@ -595,7 +599,11 @@ static uint64_t xdr_proto_sizeof(xcom_pr
-     is the case). This will keep this code cross-platform
-     and cross-version compatible.
-   */
-+#ifdef __NetBSD__
-+  stat = func(&x, data);
-+#else
-   stat = func(&x, data, 0);
-+#endif
-   free(x.x_private);
-   // x_handy is int type for old XDR
-   return stat == TRUE ? (uint64_t)x.x_handy : 0;
diff --git a/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h
new file mode 100644
index 0000000000..af95b692bb
--- /dev/null
+++ b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_impl_netif.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+NetBSD also has & needs <ifaddrs.h>
+
+--- router/src/harness/include/mysql/harness/net_ts/impl/netif.h.orig	2021-05-09 02:48:24.814349260 +0000
++++ router/src/harness/include/mysql/harness/net_ts/impl/netif.h
+@@ -31,7 +31,7 @@
+ #include <string>
+ 
+ #if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
+-    defined(__sun__)
++    defined(__sun__) || defined(__NetBSD__)
+ #define HAVE_IFADDRS_H
+ #endif
+ 
diff --git a/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_internet.h b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_internet.h
new file mode 100644
index 0000000000..cee75824cf
--- /dev/null
+++ b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_internet.h
@@ -0,0 +1,19 @@
+$NetBSD$
+
+Conditionalize some AI_* constants not present on NetBSD. 
+
+--- router/src/harness/include/mysql/harness/net_ts/internet.h.orig	2021-05-09 00:35:34.199395387 +0000
++++ router/src/harness/include/mysql/harness/net_ts/internet.h
+@@ -598,8 +598,12 @@ class resolver_base {
+   static constexpr flags canonical_name = AI_CANONNAME;
+   static constexpr flags numeric_host = AI_NUMERICHOST;
+   static constexpr flags numeric_service = AI_NUMERICSERV;
++#ifdef AI_V4MAPPED
+   static constexpr flags v4_mapped = AI_V4MAPPED;
++#endif
++#ifdef AI_ALL
+   static constexpr flags all_matching = AI_ALL;
++#endif
+   static constexpr flags address_configured = AI_ADDRCONFIG;
+ };
+ 
diff --git a/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_local.h b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_local.h
new file mode 100644
index 0000000000..19b6527950
--- /dev/null
+++ b/mysql80-client/patches/patch-router_src_harness_include_mysql_harness_net_ts_local.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+NetBSD has uucred, not sockpeercred.
+
+--- router/src/harness/include/mysql/harness/net_ts/local.h.orig	2021-05-09 01:07:01.720111634 +0000
++++ router/src/harness/include/mysql/harness/net_ts/local.h
+@@ -44,7 +44,7 @@
+ 
+ #ifdef NET_TS_HAS_UNIX_SOCKET
+ 
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+ #include <sys/ucred.h>
+ #endif
+ 
+@@ -229,7 +229,7 @@ class cred {
+ #elif defined(__FreeBSD__) || defined(__APPLE__)
+   using value_type = struct xucred;
+ #elif defined(__NetBSD__)
+-  using value_type = struct sockpeercred;
++  using value_type = struct uucred;
+ #else
+ #error "unsupported OS"
+ #endif
diff --git a/mysql80-client/patches/patch-router_src_harness_src_stdx_io_file_handle.cc b/mysql80-client/patches/patch-router_src_harness_src_stdx_io_file_handle.cc
new file mode 100644
index 0000000000..aa7ecc9821
--- /dev/null
+++ b/mysql80-client/patches/patch-router_src_harness_src_stdx_io_file_handle.cc
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Support for NetBSD - reuses F_GETPATH code originally for macOS. Also
+use correct constant for the fcntl() code - PATH_MAX, not MAXPATHLEN
+
+--- router/src/harness/src/stdx/io/file_handle.cc.orig	2021-03-22 08:44:50.000000000 +0000
++++ router/src/harness/src/stdx/io/file_handle.cc
+@@ -47,8 +47,6 @@
+ #include <sys/user.h>
+ 
+ #include <vector>
+-#elif defined(__APPLE__)
+-#include <sys/param.h>  // MAXPATHLEN
+ #endif
+ 
+ #include "mysql/harness/stdx/expected.h"
+@@ -233,9 +230,9 @@ file_handle::current_path() const noexce
+   }
+ 
+   return {std::string{path.data(), std::next(path.data(), sz)}};
+-#elif defined(__APPLE__)
++#elif defined(F_GETPATH) // __APPLE__, __NetBSD__
+   std::string path_name;
+-  path_name.resize(MAXPATHLEN + 1);
++  path_name.resize(PATH_MAX + 1);
+ 
+   if (-1 == fcntl(handle_, F_GETPATH, &path_name.front())) {
+     return stdx::make_unexpected(last_error_code());
diff --git a/mysql80-client/patches/patch-scripts_CMakeLists.txt b/mysql80-client/patches/patch-scripts_CMakeLists.txt
index 1ceff6d6a8..2c7bdc726d 100644
--- a/mysql80-client/patches/patch-scripts_CMakeLists.txt
+++ b/mysql80-client/patches/patch-scripts_CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD: patch-scripts_CMakeLists.txt,v 1.1 2016/09/16 06:49:11 adam Exp $
 
 Split configuration between mysql-client and mysql-server.
 
---- scripts/CMakeLists.txt.orig	2019-12-09 19:53:17.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2021-03-22 08:44:50.000000000 +0000
 +++ scripts/CMakeLists.txt
-@@ -414,7 +414,7 @@ ELSE()
+@@ -398,7 +398,7 @@ ELSE()
      ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
      ESCAPE_QUOTES @ONLY)
  
@@ -13,3 +13,30 @@ Split configuration between mysql-client and mysql-server.
      MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
      INSTALL(FILES
        ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
+@@ -411,19 +411,24 @@ ELSE()
+   # mysqld_safe used in mtr even for systemd platforms
+   IF(WITH_SYSTEMD)
+     SET(BIN_SCRIPTS
+-      mysql_config
+       mysqldumpslow
+       mysqld_safe
+       )
+   ELSE()
+     SET(BIN_SCRIPTS
+-      mysql_config
+       mysqldumpslow
+       mysqld_multi
+       mysqld_safe
+       )
+   ENDIF()
+ 
++  IF(NOT WITHOUT_CLIENTLIBS)
++    SET(BIN_SCRIPTS
++      ${BIN_SCRIPTS}
++      mysql_config
++    )
++  ENDIF(NOT WITHOUT_CLIENTLIBS)
++
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
+       CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
diff --git a/mysql80-client/patches/patch-sql_CMakeLists.txt b/mysql80-client/patches/patch-sql_CMakeLists.txt
index 2bd72b4610..35b276a1ec 100644
--- a/mysql80-client/patches/patch-sql_CMakeLists.txt
+++ b/mysql80-client/patches/patch-sql_CMakeLists.txt
@@ -4,10 +4,10 @@ $NetBSD$
 * use noop implementation (apple) for binding threads to a cpu
 TODO: netbsd and irix has apis for this, perhaps implement this.
 
---- sql/CMakeLists.txt.orig	2019-12-09 19:53:17.000000000 +0000
+--- sql/CMakeLists.txt.orig	2021-03-22 08:44:50.000000000 +0000
 +++ sql/CMakeLists.txt
-@@ -567,6 +567,10 @@ SET(SQL_SHARED_SOURCES
-   ${MYSQL_SERVER_SUB_COMPONENT_SOURCES}
+@@ -589,6 +589,10 @@ SET(SQL_SHARED_SOURCES
+   daemon_proxy_keyring/daemon_proxy_keyring.cc
  )
  
 +IF(NOT HAVE_FFSLL)
@@ -17,7 +17,7 @@ TODO: netbsd and irix has apis for this, perhaps implement this.
  # BISON_TARGET(<Name> <YaccInput> <CodeOutput>
  #              [COMPILE_FLAGS <flags>]
  #              [DEFINES_FILE <file>]
-@@ -663,6 +667,9 @@ ELSEIF(SOLARIS)
+@@ -689,6 +693,9 @@ ELSEIF(SOLARIS)
  ELSEIF(WIN32)
    LIST(APPEND SQL_SHARED_SOURCES
      resourcegroups/platform/thread_attrs_api_win.cc)
diff --git a/mysql80-client/patches/patch-sql_item_geofunc_relchecks_bgwrap.h b/mysql80-client/patches/patch-sql_item_geofunc_relchecks_bgwrap.h
new file mode 100644
index 0000000000..d05b735c3b
--- /dev/null
+++ b/mysql80-client/patches/patch-sql_item_geofunc_relchecks_bgwrap.h
@@ -0,0 +1,15 @@
+$NetBSD$
+
+<algorithm> is needed to define std::for_each() required by the boost 1.73
+headers
+
+--- sql/item_geofunc_relchecks_bgwrap.h.orig	2021-05-09 10:15:24.903436550 +0000
++++ sql/item_geofunc_relchecks_bgwrap.h
+@@ -39,6 +39,7 @@
+ #include <set>
+ #include <string>  // Boost expects std::string to be already present.
+ #include <vector>
++#include <algorithm>
+ 
+ #include <boost/geometry/algorithms/crosses.hpp>
+ #include <boost/geometry/algorithms/intersects.hpp>
diff --git a/mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc b/mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc
index ea170f5eb7..00f08509cc 100644
--- a/mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc
+++ b/mysql80-client/patches/patch-sql_resourcegroups_platform_thread__attrs__api__apple.cc
@@ -2,46 +2,34 @@ $NetBSD$
 
 * support getting the cpu count on netbsd, openbsd and irix
 
---- sql/resourcegroups/platform/thread_attrs_api_apple.cc.orig	2019-12-09 19:53:17.000000000 +0000
+--- sql/resourcegroups/platform/thread_attrs_api_apple.cc.orig	2021-03-22 08:44:50.000000000 +0000
 +++ sql/resourcegroups/platform/thread_attrs_api_apple.cc
-@@ -24,6 +24,10 @@
- #include <sys/sysctl.h>
- #include <sys/types.h>
- 
-+#ifdef IRIX5
-+#include <sys/sysmp.h>
-+#endif
-+
- #include "my_dbug.h"
- #include "sql/log.h"
- 
-@@ -84,8 +88,19 @@ bool set_thread_priority(int, my_thread_
+@@ -84,14 +84,28 @@ bool set_thread_priority(int, my_thread_
  
  uint32_t num_vcpus_using_affinity() { return 0; }
  
 +
 +#ifdef IRIX5
- uint32_t num_vcpus_using_config() {
++#include <sys/sysmp.h>
++
++uint32_t num_vcpus_using_config() {
 +  return sysmp(MP_NAPROCS);
 +}
 +#else
 +
-+uint32_t num_vcpus_using_config() {
-+#if (defined(__NetBSD__) || defined(__OpenBSD__))
-+  int name[2] = {CTL_HW, HW_NCPUONLINE};
-+#else
+ uint32_t num_vcpus_using_config() {
++#ifdef HW_AVAILCPU
    int name[2] = {CTL_HW, HW_AVAILCPU};
++#else
++  int name[2] = {CTL_HW, HW_NCPUONLINE};
 +#endif
    int ncpu;
  
    size_t size = sizeof(ncpu);
-@@ -93,6 +108,9 @@ uint32_t num_vcpus_using_config() {
+   sysctl(name, 2, &ncpu, &size, nullptr, 0);
    return ncpu;
  }
- 
 +#endif
-+
-+
+ 
  bool can_thread_priority_be_set() {
-   DBUG_ASSERT(0);
-   return false;
+   assert(0);
diff --git a/mysql80-client/patches/patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh b/mysql80-client/patches/patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh
deleted file mode 100644
index 98fee7bb96..0000000000
--- a/mysql80-client/patches/patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-storage_ndb_mcc_frontend_dojo_dojox_mobile_build_build.sh,v 1.1 2016/09/16 06:49:11 adam Exp $
-
-Portability.
-
---- storage/ndb/mcc/frontend/dojo/dojox/mobile/build/build.sh.orig	2019-12-09 19:53:17.000000000 +0000
-+++ storage/ndb/mcc/frontend/dojo/dojox/mobile/build/build.sh
-@@ -14,10 +14,10 @@ optimize=closure
- profile=mobile
- dir=release-mobile-separate
- #standalone=standaloneScrollable=true
--if [ "$1" == "single" ]; then
-+if [ "$1" = "single" ]; then
-   profile=mobile-all
- fi
--if [ "$1" == "single" ]; then
-+if [ "$1" = "single" ]; then
-   dir=release-mobile-single
- fi
- shift 1
diff --git a/mysql80-client/patches/patch-vio_viosocket.cc b/mysql80-client/patches/patch-vio_viosocket.cc
index 4a06d63366..6c1474cd3d 100644
--- a/mysql80-client/patches/patch-vio_viosocket.cc
+++ b/mysql80-client/patches/patch-vio_viosocket.cc
@@ -1,14 +1,16 @@
 $NetBSD$
 
-* don't use kqueue on netbsd since it misses EVFILT_USER
+* don't use kqueue on older NetBSD which misses EVFILT_USER
 
---- vio/viosocket.cc.orig	2019-12-09 19:53:17.000000000 +0000
+$NetBSD$
+
+--- vio/viosocket.cc.orig	2021-03-22 08:44:50.000000000 +0000
 +++ vio/viosocket.cc
-@@ -68,6 +68,10 @@
+@@ -70,6 +70,10 @@
  
  #include "mysql/psi/mysql_socket.h"
  
-+#ifdef __NetBSD__
++#if defined(HAVE_QUEUE) && !defined(EVFILT_USER)
 +#undef HAVE_KQUEUE
 +#endif
 +
diff --git a/mysql80-server/Makefile b/mysql80-server/Makefile
index 59aa0d8388..ed0add942e 100644
--- a/mysql80-server/Makefile
+++ b/mysql80-server/Makefile
@@ -38,6 +38,10 @@ MESSAGE_SUBST+=		MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP}
 BUILD_DEFS+=		MYSQL_DATADIR
 
 REPLACE_PERL+=		mysql-test/lib/v1/mysql-test-run.pl
+REPLACE_PERL+=		mysql-test/lib/t/SafeProcessStress.pl
+REPLACE_PERL+=		mysql-test/lib/t/testMyConfig.t
+REPLACE_PERL+=		mysql-test/lib/t/testMyConfigFactory.t
+REPLACE_PERL+=		mysql-test/lib/t/test_child.pl
 REPLACE_PERL+=		mysql-test/mysql-stress-test.pl
 REPLACE_PERL+=		mysql-test/mysql-test-run.pl
 REPLACE_PERL+=		mysql-test/suite/engines/rr_trx/run_stress_tx_rr.pl
@@ -47,6 +51,7 @@ REPLACE_PERL+=		mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl
 REPLACE_PERL+=		mysql-test/suite/opt_trace/validate_json.pl
 REPLACE_PERL+=		mysql-test/suite/rpl/extension/bhs.pl
 REPLACE_PERL+=		mysql-test/suite/rpl/extension/checksum.pl
+REPLACE_PERL+=		scripts/randomize-order.pl
 
 REPLACE_SH+=		mysql-test/suite/rpl/t/rpl_loaddata_symlink-master.sh
 REPLACE_SH+=		mysql-test/suite/rpl/t/rpl_loaddata_symlink-slave.sh
@@ -60,7 +65,6 @@ REPLACE_SH+=		scripts/mysql_config.sh
 SUBST_CLASSES+=		perlpath
 SUBST_STAGE.perlpath=	pre-configure
 SUBST_MESSAGE.perlpath=	Fixing Perl paths.
-SUBST_FILES.perlpath=	scripts/mysql_config.pl.in
 SUBST_FILES.perlpath+=	scripts/mysqld_multi.pl.in
 SUBST_FILES.perlpath+=	scripts/mysqldumpslow.pl.in
 SUBST_SED.perlpath=	-e 's,@PERL_PATH@,${PERL5},g'
@@ -77,8 +81,11 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysqlrouter
 
+CMAKE_ARGS+=		-DWITHOUT_CLIENTLIBS="ON"
+
 post-extract:
-	cp ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/
+	${CP} ${FILESDIR}/ffsll.cc ${WRKSRC}/sql/
+	${CHMOD} a-x ${WRKSRC}/mysql-test/std_data/datadir_tablespace_*
 
 .include "../../devel/protobuf/buildlink3.mk"
 BUILDLINK_AUTO_DIRS.mysql-client=	no
diff --git a/mysql80-server/PLIST b/mysql80-server/PLIST
index 2cd454d815..2754e3eca6 100644
--- a/mysql80-server/PLIST
+++ b/mysql80-server/PLIST
@@ -7,7 +7,7 @@ bin/myisam_ftdump
 bin/myisamchk
 bin/myisamlog
 bin/myisampack
-bin/mysql_config
+bin/mysql_keyring_encryption_test
 bin/mysql_secure_installation
 bin/mysql_tzinfo_to_sql
 bin/mysql_upgrade
@@ -23,21 +23,30 @@ bin/mysqltest_safe_process
 bin/mysqlxtest
 bin/perror
 bin/zlib_decompress
+docs/sample_mysqlrouter.conf
 include/mysql/mysqlx_ername.h
 include/mysql/mysqlx_error.h
 include/mysql/mysqlx_version.h
 lib/libmysqlharness.so.1
+lib/libmysqlharness_stdx.so.1
+lib/libmysqlharness_tls.so.1
 lib/libmysqlrouter.so.1
 lib/libmysqlrouter_http.so.1
+lib/libmysqlrouter_http_auth_backend.so.1
+lib/libmysqlrouter_http_auth_realm.so.1
+lib/libmysqlrouter_io_component.so.1
 lib/libmysqlservices.a
+${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
+${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
+${PLIST.memcached}lib/mysql/plugin/libmemcached.so
 lib/mysql/plugin/adt_null.so
 lib/mysql/plugin/auth.so
-${PLIST.auth_socket}lib/mysql/plugin/auth_socket.so
 lib/mysql/plugin/auth_test_plugin.so
 lib/mysql/plugin/component_audit_api_message_emit.so
 lib/mysql/plugin/component_example_component1.so
 lib/mysql/plugin/component_example_component2.so
 lib/mysql/plugin/component_example_component3.so
+lib/mysql/plugin/component_keyring_file.so
 lib/mysql/plugin/component_log_filter_dragnet.so
 lib/mysql/plugin/component_log_sink_json.so
 lib/mysql/plugin/component_log_sink_syseventlog.so
@@ -46,8 +55,11 @@ lib/mysql/plugin/component_mysqlbackup.so
 lib/mysql/plugin/component_mysqlx_global_reset.so
 lib/mysql/plugin/component_pfs_example.so
 lib/mysql/plugin/component_pfs_example_component_population.so
+lib/mysql/plugin/component_query_attributes.so
+lib/mysql/plugin/component_reference_cache.so
 lib/mysql/plugin/component_test_audit_api_message.so
 lib/mysql/plugin/component_test_backup_lock_service.so
+lib/mysql/plugin/component_test_component_deinit.so
 lib/mysql/plugin/component_test_host_application_signal.so
 lib/mysql/plugin/component_test_mysql_current_thread_reader.so
 lib/mysql/plugin/component_test_mysql_runtime_error.so
@@ -84,11 +96,9 @@ lib/mysql/plugin/ddl_rewriter.so
 lib/mysql/plugin/group_replication.so
 lib/mysql/plugin/ha_example.so
 lib/mysql/plugin/ha_mock.so
-${PLIST.memcached}lib/mysql/plugin/innodb_engine.so
 lib/mysql/plugin/keyring_file.so
 lib/mysql/plugin/keyring_udf.so
 lib/mysql/plugin/libdaemon_example.so
-${PLIST.memcached}lib/mysql/plugin/libmemcached.so
 lib/mysql/plugin/libtest_framework.so
 lib/mysql/plugin/libtest_services.so
 lib/mysql/plugin/libtest_services_threaded.so
@@ -107,6 +117,7 @@ lib/mysql/plugin/libtest_sql_processlist.so
 lib/mysql/plugin/libtest_sql_replication.so
 lib/mysql/plugin/libtest_sql_reset_connection.so
 lib/mysql/plugin/libtest_sql_shutdown.so
+lib/mysql/plugin/libtest_sql_sleep_is_connected.so
 lib/mysql/plugin/libtest_sql_sqlmode.so
 lib/mysql/plugin/libtest_sql_stmt.so
 lib/mysql/plugin/libtest_sql_stored_procedures_functions.so
@@ -136,13 +147,15 @@ lib/mysql/plugin/version_token.so
 lib/mysqlrouter/http_auth_backend.so
 lib/mysqlrouter/http_auth_realm.so
 lib/mysqlrouter/http_server.so
+lib/mysqlrouter/io.so
 lib/mysqlrouter/keepalive.so
 lib/mysqlrouter/metadata_cache.so
-lib/mysqlrouter/mysql_protocol.so
 lib/mysqlrouter/rest_api.so
 lib/mysqlrouter/rest_metadata_cache.so
 lib/mysqlrouter/rest_router.so
 lib/mysqlrouter/rest_routing.so
+lib/mysqlrouter/router_openssl.so
+lib/mysqlrouter/router_protobuf.so
 lib/mysqlrouter/routing.so
 sbin/mysqld
 share/aclocal/mysql.m4
@@ -155,7 +168,7 @@ share/doc/mysql/LICENSE.router
 share/doc/mysql/README
 share/doc/mysql/README-test
 share/doc/mysql/README.router
-share/doc/mysql/sample_mysqlrouter.conf
+share/examples/rc.d/mysqld
 share/mysql/bulgarian/errmsg.sys
 share/mysql/charsets/Index.xml
 share/mysql/charsets/README
@@ -193,7 +206,6 @@ share/mysql/french/errmsg.sys
 share/mysql/german/errmsg.sys
 share/mysql/greek/errmsg.sys
 share/mysql/hungarian/errmsg.sys
-share/mysql/innodb_memcached_config.sql
 share/mysql/install_rewriter.sql
 share/mysql/italian/errmsg.sys
 share/mysql/japanese/errmsg.sys
@@ -203,6 +215,7 @@ share/mysql/messages_to_error_log.txt
 share/mysql/mysql-log-rotate
 share/mysql/mysql.server
 share/mysql/mysqld_multi.server
+share/mysql/mysqlrouter-log-rotate
 share/mysql/norwegian-ny/errmsg.sys
 share/mysql/norwegian/errmsg.sys
 share/mysql/polish/errmsg.sys
@@ -224,7 +237,6 @@ share/mysql/test/collections/default.daily-valgrind
 share/mysql/test/collections/default.push
 share/mysql/test/collections/default.push-ndbcluster
 share/mysql/test/collections/default.push-valgrind
-share/mysql/test/collections/default.push-vanilla
 share/mysql/test/collections/default.release
 share/mysql/test/collections/default.release.done
 share/mysql/test/collections/default.weekly
@@ -239,6 +251,7 @@ share/mysql/test/collections/disabled.def
 share/mysql/test/collections/disabled_ndb.def
 share/mysql/test/collections/mysql-8.0-stage.push
 share/mysql/test/collections/mysql-8.0-stage.push.basic
+share/mysql/test/collections/mysql-trunk-meb-itch.push
 share/mysql/test/collections/mysql-trunk-stage.push
 share/mysql/test/collections/mysql-trunk-stage.push.basic
 share/mysql/test/collections/mysql-trunk-tsan.push
@@ -276,7 +289,7 @@ share/mysql/test/extra/binlog_tests/drop_table.test
 share/mysql/test/extra/binlog_tests/drop_temp_table.test
 share/mysql/test/extra/binlog_tests/enforce_gtid_consistency.test
 share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_create_select_consistent.test
-share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_create_select_violation.test
+share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_nontrx_create_select_violation.test
 share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_statement.inc
 share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_tmp_consistent.test
 share/mysql/test/extra/binlog_tests/enforce_gtid_consistency_tmp_violation.test
@@ -300,6 +313,7 @@ share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_streaming_input_1.inc
 share/mysql/test/extra/binlog_tests/mysqlbinlog_start_stop_streaming_input_2.inc
 share/mysql/test/extra/binlog_tests/print_optional_metadata.inc
 share/mysql/test/extra/binlog_tests/tmp_table.test
+share/mysql/test/extra/rpl_tests/binlog_transaction_compression.inc
 share/mysql/test/extra/rpl_tests/check_slave_delay.inc
 share/mysql/test/extra/rpl_tests/check_slave_delay_line_topology.inc
 share/mysql/test/extra/rpl_tests/check_slave_delay_multi_source.inc
@@ -310,6 +324,9 @@ share/mysql/test/extra/rpl_tests/create_recursive_construct.inc
 share/mysql/test/extra/rpl_tests/create_recursive_construct_stmt_capable_engine.inc
 share/mysql/test/extra/rpl_tests/delayed_slave_wait_on_query.inc
 share/mysql/test/extra/rpl_tests/gtid_disconnect_drop_temporary_table.test
+share/mysql/test/extra/rpl_tests/mts_spco_generate_deadlock.inc
+share/mysql/test/extra/rpl_tests/mts_spco_generate_deadlock_cleanup.inc
+share/mysql/test/extra/rpl_tests/mts_spco_generate_deadlock_setup.inc
 share/mysql/test/extra/rpl_tests/restart_slave_with_custom_relaylog_repo_file.inc
 share/mysql/test/extra/rpl_tests/rpl_EE_err.test
 share/mysql/test/extra/rpl_tests/rpl_auto_increment.test
@@ -335,6 +352,7 @@ share/mysql/test/extra/rpl_tests/rpl_crash_safe.test
 share/mysql/test/extra/rpl_tests/rpl_create_drop_temporary_in_function_or_trigger.test
 share/mysql/test/extra/rpl_tests/rpl_create_drop_temporary_in_transaction.test
 share/mysql/test/extra/rpl_tests/rpl_create_msr_channels.inc
+share/mysql/test/extra/rpl_tests/rpl_create_select.inc
 share/mysql/test/extra/rpl_tests/rpl_db_stmts_ignored.inc
 share/mysql/test/extra/rpl_tests/rpl_deadlock.test
 share/mysql/test/extra/rpl_tests/rpl_delete_no_where.test
@@ -385,6 +403,8 @@ share/mysql/test/extra/rpl_tests/rpl_mts_execute_partial_trx_in_relay_log.inc
 share/mysql/test/extra/rpl_tests/rpl_mts_pending_events.inc
 share/mysql/test/extra/rpl_tests/rpl_mts_relay_log_recovery.test
 share/mysql/test/extra/rpl_tests/rpl_mts_slave_preserve_commit_order_nobinlog.inc
+share/mysql/test/extra/rpl_tests/rpl_mts_spco_acl_commands.test
+share/mysql/test/extra/rpl_tests/rpl_mts_spco_alter_table_commands.test
 share/mysql/test/extra/rpl_tests/rpl_mts_spco_check_worker_states.inc
 share/mysql/test/extra/rpl_tests/rpl_mts_spco_check_worker_states.test
 share/mysql/test/extra/rpl_tests/rpl_mts_spco_commands.test
@@ -482,6 +502,7 @@ share/mysql/test/include/add_extra_root_users.inc
 share/mysql/test/include/allowed_ciphers.inc
 share/mysql/test/include/analyze-sync_with_master.test
 share/mysql/test/include/analyze-timeout.test
+share/mysql/test/include/asan_have_debug.inc
 share/mysql/test/include/assert.inc
 share/mysql/test/include/assert_and_disable_offline_mode.inc
 share/mysql/test/include/assert_and_disable_read_only.inc
@@ -589,6 +610,10 @@ share/mysql/test/include/daemon_example_bad_soname.ini
 share/mysql/test/include/dbug_crash.inc
 share/mysql/test/include/dbug_crash_all.inc
 share/mysql/test/include/dbug_crash_safe.inc
+share/mysql/test/include/dd_pfs_cleanup.inc
+share/mysql/test/include/dd_pfs_init.inc
+share/mysql/test/include/dd_pfs_report_state.inc
+share/mysql/test/include/dd_pfs_save_state.inc
 share/mysql/test/include/dd_schema_assert_and_fill_table_names.inc
 share/mysql/test/include/dd_schema_assert_ids.inc
 share/mysql/test/include/dd_schema_dd_properties.inc
@@ -613,6 +638,7 @@ share/mysql/test/include/end_include_file.inc
 share/mysql/test/include/end_replace_combination.inc
 share/mysql/test/include/end_replace_gtid_combination.inc
 share/mysql/test/include/endspace.inc
+share/mysql/test/include/engine_attribute.inc
 share/mysql/test/include/escape_sql.inc
 share/mysql/test/include/eval.inc
 share/mysql/test/include/excludenoskip.list
@@ -721,6 +747,7 @@ share/mysql/test/include/have_blackhole_plugin.inc
 share/mysql/test/include/have_case_insensitive_file_system.inc
 share/mysql/test/include/have_case_sensitive_file_system.inc
 share/mysql/test/include/have_clone_plugin.inc
+share/mysql/test/include/have_component_keyring_file.inc
 share/mysql/test/include/have_component_test_sys_var_service.inc
 share/mysql/test/include/have_daemon_example_plugin.inc
 share/mysql/test/include/have_debug.inc
@@ -734,11 +761,13 @@ share/mysql/test/include/have_grep.inc
 share/mysql/test/include/have_group_replication_gtid_assignment_block_size_1.inc
 share/mysql/test/include/have_group_replication_plugin.inc
 share/mysql/test/include/have_group_replication_plugin_base.inc
+share/mysql/test/include/have_gtid_mode_off.inc
 share/mysql/test/include/have_ibd2sdi_debug.inc
 share/mysql/test/include/have_innochecksum_debug.inc
 share/mysql/test/include/have_innodb_16k.inc
 share/mysql/test/include/have_innodb_default_undo_tablespaces.inc
 share/mysql/test/include/have_innodb_max_16k.inc
+share/mysql/test/include/have_innodb_min_16k.inc
 share/mysql/test/include/have_innodb_min_8k.inc
 share/mysql/test/include/have_ipv4_mapped.inc
 share/mysql/test/include/have_ipv6.inc
@@ -767,6 +796,7 @@ share/mysql/test/include/have_ndb_debug.inc
 share/mysql/test/include/have_ndbapi_examples.inc
 share/mysql/test/include/have_ngram.inc
 share/mysql/test/include/have_no_lock_order.inc
+share/mysql/test/include/have_no_punch_hole.inc
 share/mysql/test/include/have_nodebug.inc
 share/mysql/test/include/have_not_thread_prio.inc
 share/mysql/test/include/have_null_audit_plugin.inc
@@ -785,6 +815,7 @@ share/mysql/test/include/have_plugin_server.inc
 share/mysql/test/include/have_posix_locale.inc
 share/mysql/test/include/have_profiling.inc
 share/mysql/test/include/have_ps_protocol.inc
+share/mysql/test/include/have_punch_hole.inc
 share/mysql/test/include/have_replication_observers_example_plugin.inc
 share/mysql/test/include/have_semisync_plugin.inc
 share/mysql/test/include/have_simple_parser.inc
@@ -823,6 +854,7 @@ share/mysql/test/include/innodb-index.inc
 share/mysql/test/include/innodb-util.inc
 share/mysql/test/include/innodb_gis_row_format_basic.inc
 share/mysql/test/include/innodb_gis_undo.inc
+share/mysql/test/include/innodb_monitor_restore.inc
 share/mysql/test/include/innodb_pk_extension.inc
 share/mysql/test/include/innodb_rollback_on_timeout.inc
 share/mysql/test/include/innodb_trx_weight.inc
@@ -831,6 +863,7 @@ share/mysql/test/include/install_replication_observers_example.inc
 share/mysql/test/include/install_semisync.inc
 share/mysql/test/include/install_semisync_master.inc
 share/mysql/test/include/install_semisync_slave.inc
+share/mysql/test/include/invisible_columns.inc
 share/mysql/test/include/invisible_indexes.inc
 share/mysql/test/include/io_thd_fault_injection.inc
 share/mysql/test/include/ipv6.inc
@@ -838,6 +871,101 @@ share/mysql/test/include/ipv6_clients.inc
 share/mysql/test/include/ipv6_func.inc
 share/mysql/test/include/is_local_machine.inc
 share/mysql/test/include/join_cache.inc
+share/mysql/test/include/keyring_tests/binlog/rpl_binlog_cache_encryption.inc
+share/mysql/test/include/keyring_tests/binlog/rpl_binlog_cache_temp_file_encryption.inc
+share/mysql/test/include/keyring_tests/binlog/rpl_default_table_encryption.inc
+share/mysql/test/include/keyring_tests/binlog/rpl_encryption_master_key_rotation_at_startup.inc
+share/mysql/test/include/keyring_tests/encryption/alter_rename_table.inc
+share/mysql/test/include/keyring_tests/encryption/alter_rename_table_tests.inc
+share/mysql/test/include/keyring_tests/encryption/alter_table.inc
+share/mysql/test/include/keyring_tests/encryption/alter_table_tests.inc
+share/mysql/test/include/keyring_tests/encryption/dd_upgrade_encrypted.inc
+share/mysql/test/include/keyring_tests/encryption/engine.inc
+share/mysql/test/include/keyring_tests/encryption/mysqldump.inc
+share/mysql/test/include/keyring_tests/encryption/rename_table.inc
+share/mysql/test/include/keyring_tests/encryption/rename_table_tests.inc
+share/mysql/test/include/keyring_tests/encryption/tablespace_with_tables.inc
+share/mysql/test/include/keyring_tests/encryption/tablespace_with_tables_tests.inc
+share/mysql/test/include/keyring_tests/encryption/upgrade.inc
+share/mysql/test/include/keyring_tests/helper/binary_backup_manifest.inc
+share/mysql/test/include/keyring_tests/helper/binary_create_customized_manifest.inc
+share/mysql/test/include/keyring_tests/helper/binary_create_manifest.inc
+share/mysql/test/include/keyring_tests/helper/binary_remove_manifest.inc
+share/mysql/test/include/keyring_tests/helper/binary_restore_manifest.inc
+share/mysql/test/include/keyring_tests/helper/cleanup_server_with_manifest.inc
+share/mysql/test/include/keyring_tests/helper/global_keyring_config_backup.inc
+share/mysql/test/include/keyring_tests/helper/global_keyring_config_restore.inc
+share/mysql/test/include/keyring_tests/helper/global_keyring_create_config.inc
+share/mysql/test/include/keyring_tests/helper/global_keyring_create_customized_config.inc
+share/mysql/test/include/keyring_tests/helper/global_keyring_remove_config.inc
+share/mysql/test/include/keyring_tests/helper/instance_backup_manifest.inc
+share/mysql/test/include/keyring_tests/helper/instance_create_manifest.inc
+share/mysql/test/include/keyring_tests/helper/instance_remove_manifest.inc
+share/mysql/test/include/keyring_tests/helper/instance_restore_manifest.inc
+share/mysql/test/include/keyring_tests/helper/local_keyring_create_config.inc
+share/mysql/test/include/keyring_tests/helper/local_keyring_file_backup.inc
+share/mysql/test/include/keyring_tests/helper/local_keyring_file_remove.inc
+share/mysql/test/include/keyring_tests/helper/local_keyring_file_restore.inc
+share/mysql/test/include/keyring_tests/helper/local_keyring_remove_config.inc
+share/mysql/test/include/keyring_tests/helper/migrate_from_plugin_to_component.inc
+share/mysql/test/include/keyring_tests/helper/start_server_with_manifest.inc
+share/mysql/test/include/keyring_tests/innodb/encrypt_explicit.inc
+share/mysql/test/include/keyring_tests/innodb/import_compress_encrypt.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_2.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_3.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_4.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_5.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_6.inc
+share/mysql/test/include/keyring_tests/innodb/log_encrypt_kill.inc
+share/mysql/test/include/keyring_tests/innodb/mysql_ts_alter_encrypt_2.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_3.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_4.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_5.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_debug.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_fts.inc
+share/mysql/test/include/keyring_tests/innodb/table_encrypt_kill.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_1.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_10.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_11.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_3.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_4.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_5.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_7.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_8.inc
+share/mysql/test/include/keyring_tests/innodb/tablespace_encrypt_9.inc
+share/mysql/test/include/keyring_tests/innodb/undo_encrypt_crash.inc
+share/mysql/test/include/keyring_tests/innodb/undo_tablespace_encrypt.inc
+share/mysql/test/include/keyring_tests/mats/alter_database.inc
+share/mysql/test/include/keyring_tests/mats/alter_empty_tablespace.inc
+share/mysql/test/include/keyring_tests/mats/clone_command.inc
+share/mysql/test/include/keyring_tests/mats/clone_command_send.inc
+share/mysql/test/include/keyring_tests/mats/clone_local_encrypt.inc
+share/mysql/test/include/keyring_tests/mats/create_database.inc
+share/mysql/test/include/keyring_tests/mats/create_schema.inc
+share/mysql/test/include/keyring_tests/mats/create_table.inc
+share/mysql/test/include/keyring_tests/mats/create_table_tests.inc
+share/mysql/test/include/keyring_tests/mats/create_tablespace.inc
+share/mysql/test/include/keyring_tests/mats/database.inc
+share/mysql/test/include/keyring_tests/mats/drop_schema.inc
+share/mysql/test/include/keyring_tests/mats/keyring_component_status.inc
+share/mysql/test/include/keyring_tests/mats/keyring_encryption.inc
+share/mysql/test/include/keyring_tests/mats/keyring_udf_aes_test.inc
+share/mysql/test/include/keyring_tests/mats/keyring_udf_secret_test.inc
+share/mysql/test/include/keyring_tests/mats/keyring_udf_test.inc
+share/mysql/test/include/keyring_tests/mats/log_encrypt_1.inc
+share/mysql/test/include/keyring_tests/mats/mysql_ts_alter_encrypt_1.inc
+share/mysql/test/include/keyring_tests/mats/rpl_encryption.inc
+share/mysql/test/include/keyring_tests/mats/rpl_encryption_master_key_generation_recovery.inc
+share/mysql/test/include/keyring_tests/mats/table_encrypt_1.inc
+share/mysql/test/include/keyring_tests/mats/table_encrypt_2.inc
+share/mysql/test/include/keyring_tests/mats/table_encrypt_6.inc
+share/mysql/test/include/keyring_tests/mats/tablespace.inc
+share/mysql/test/include/keyring_tests/mats/tablespace_encrypt_1.inc
+share/mysql/test/include/keyring_tests/mats/tablespace_encrypt_2.inc
+share/mysql/test/include/keyring_tests/mats/tablespace_encrypt_6.inc
+share/mysql/test/include/keyring_tests/mats/undo_encrypt_basic.inc
+share/mysql/test/include/keyring_tests/mats/undo_encrypt_bootstrap.inc
+share/mysql/test/include/keyring_tests/migration/migration.inc
 share/mysql/test/include/keyring_udf_keyring_plugin_loaded.inc
 share/mysql/test/include/keyring_udf_keyring_plugin_loaded_store_operations.inc
 share/mysql/test/include/keyring_udf_keyring_plugin_loaded_symmetric.inc
@@ -892,7 +1020,6 @@ share/mysql/test/include/mysqlxtest_macro_dir.inc
 share/mysql/test/include/ndb_backup.inc
 share/mysql/test/include/ndb_backup_id.inc
 share/mysql/test/include/ndb_backup_print.inc
-share/mysql/test/include/ndb_index_stat_wait.inc
 share/mysql/test/include/ndb_no_result_file.inc
 share/mysql/test/include/ndb_not_readonly.inc
 share/mysql/test/include/ndb_restore_master.inc
@@ -908,6 +1035,7 @@ share/mysql/test/include/no_protocol.inc
 share/mysql/test/include/no_ps_protocol.inc
 share/mysql/test/include/no_running_event_scheduler.inc
 share/mysql/test/include/no_running_events.inc
+share/mysql/test/include/no_slave_preserve_commit_order.inc
 share/mysql/test/include/no_sp_protocol.inc
 share/mysql/test/include/no_valgrind_without_big.inc
 share/mysql/test/include/no_view_protocol.inc
@@ -917,13 +1045,16 @@ share/mysql/test/include/not_asan_windows.inc
 share/mysql/test/include/not_binlog_format_mixed.inc
 share/mysql/test/include/not_binlog_format_row.inc
 share/mysql/test/include/not_binlog_format_statement.inc
+share/mysql/test/include/not_binlog_transaction_compression_on.inc
 share/mysql/test/include/not_crashrep.inc
 share/mysql/test/include/not_debian.inc
 share/mysql/test/include/not_freebsd.inc
 share/mysql/test/include/not_group_replication_plugin.inc
 share/mysql/test/include/not_have_fips.inc
 share/mysql/test/include/not_have_innodb_4k.inc
+share/mysql/test/include/not_have_privilege_checks_user.inc
 share/mysql/test/include/not_have_tlsv13.inc
+share/mysql/test/include/not_hypergraph.inc
 share/mysql/test/include/not_log_bin.inc
 share/mysql/test/include/not_lowercase1.inc
 share/mysql/test/include/not_lsan.inc
@@ -934,6 +1065,7 @@ share/mysql/test/include/not_min_protocol_tlsv12.inc
 share/mysql/test/include/not_mts_slave_parallel_workers.inc
 share/mysql/test/include/not_ndb_default.inc
 share/mysql/test/include/not_parallel.inc
+share/mysql/test/include/not_partial_revokes.inc
 share/mysql/test/include/not_relay_log_info_file.inc
 share/mysql/test/include/not_solaris.inc
 share/mysql/test/include/not_sparc.inc
@@ -954,6 +1086,7 @@ share/mysql/test/include/only_mts_slave_parallel_type_logical_clock.inc
 share/mysql/test/include/only_mts_slave_parallel_workers.inc
 share/mysql/test/include/openssl_cert_generation_debug_test.inc
 share/mysql/test/include/order_by.inc
+share/mysql/test/include/outfile_fsync.inc
 share/mysql/test/include/parser-big.inc
 share/mysql/test/include/parser_bug21114.inc
 share/mysql/test/include/partition_date_range.inc
@@ -998,6 +1131,7 @@ share/mysql/test/include/restore_strict_mode.inc
 share/mysql/test/include/rowid_order.inc
 share/mysql/test/include/rpl_change_topology.inc
 share/mysql/test/include/rpl_change_topology_helper.inc
+share/mysql/test/include/rpl_clear_priv_checks_user_configuration.inc
 share/mysql/test/include/rpl_connect.inc
 share/mysql/test/include/rpl_connection.inc
 share/mysql/test/include/rpl_connection_master.inc
@@ -1013,6 +1147,7 @@ share/mysql/test/include/rpl_for_each_server.inc
 share/mysql/test/include/rpl_for_each_server_stmt.inc
 share/mysql/test/include/rpl_generate_sync_chain.inc
 share/mysql/test/include/rpl_get_end_of_relay_log.inc
+share/mysql/test/include/rpl_get_instance_priv_checks_user.inc
 share/mysql/test/include/rpl_get_log_encryption_key_id.inc
 share/mysql/test/include/rpl_group_replication_default_connections.inc
 share/mysql/test/include/rpl_group_replication_plugin_installed.inc
@@ -1026,10 +1161,13 @@ share/mysql/test/include/rpl_log_file_max_number.inc
 share/mysql/test/include/rpl_multi_engine.inc
 share/mysql/test/include/rpl_multi_engine3.inc
 share/mysql/test/include/rpl_pfs_assert_status.inc
+share/mysql/test/include/rpl_priv_checks_user_configuration.inc
+share/mysql/test/include/rpl_priv_checks_user_no_dynamic_grants.cnf
 share/mysql/test/include/rpl_read_binlog_index_into_table.inc
 share/mysql/test/include/rpl_receive_event_count.inc
 share/mysql/test/include/rpl_reconnect.inc
 share/mysql/test/include/rpl_reset.inc
+share/mysql/test/include/rpl_reset_slave.inc
 share/mysql/test/include/rpl_reset_slave_helper.inc
 share/mysql/test/include/rpl_restart_server.inc
 share/mysql/test/include/rpl_row_img_general_loop.inc
@@ -1045,13 +1183,13 @@ share/mysql/test/include/rpl_stop_server.inc
 share/mysql/test/include/rpl_stop_slaves.inc
 share/mysql/test/include/rpl_sync.inc
 share/mysql/test/include/rpl_udf.inc
-share/mysql/test/include/rpl_use_privilege_db.inc
 share/mysql/test/include/running_event_scheduler.inc
 share/mysql/test/include/safe_set_to_maybe_ro_var.inc
 share/mysql/test/include/save_binlog_position.inc
 share/mysql/test/include/save_io_thread_pos.inc
 share/mysql/test/include/save_master_pos.inc
 share/mysql/test/include/save_semisync_yesno_tx.inc
+share/mysql/test/include/schema_read_only.inc
 share/mysql/test/include/sdi_perl_func.pl
 share/mysql/test/include/search_pattern.inc
 share/mysql/test/include/search_pattern_multiline.inc
@@ -1063,6 +1201,7 @@ share/mysql/test/include/set_binlog_format_row.sql
 share/mysql/test/include/set_binlog_format_statement.sql
 share/mysql/test/include/set_gtid_next.inc
 share/mysql/test/include/set_gtid_next_gtid_mode_agnostic.inc
+share/mysql/test/include/set_privilege_checks_user_as_system_user.inc
 share/mysql/test/include/setup_fake_relay_log.inc
 share/mysql/test/include/show_all_binlogs.inc
 share/mysql/test/include/show_all_relay_logs.inc
@@ -1082,6 +1221,8 @@ share/mysql/test/include/show_rpl_debug_info.inc
 share/mysql/test/include/show_slave_hosts.inc
 share/mysql/test/include/show_slave_status.inc
 share/mysql/test/include/shutdown_mysqld.inc
+share/mysql/test/include/skip_config_privilege_checks_user.inc
+share/mysql/test/include/skip_defaults_privilege_checks_user.inc
 share/mysql/test/include/skip_records_in_range.inc
 share/mysql/test/include/skip_scan_data.inc
 share/mysql/test/include/skip_scan_query.inc
@@ -1099,6 +1240,7 @@ share/mysql/test/include/start_slave_sql.inc
 share/mysql/test/include/start_transaction_high_prio.inc
 share/mysql/test/include/stop_dump_threads.inc
 share/mysql/test/include/stop_group_replication.inc
+share/mysql/test/include/stop_mysqld.inc
 share/mysql/test/include/stop_slave.inc
 share/mysql/test/include/stop_slave_io.inc
 share/mysql/test/include/stop_slave_sql.inc
@@ -1114,6 +1256,7 @@ share/mysql/test/include/sync_slave_sql.inc
 share/mysql/test/include/sync_slave_sql_with_io.inc
 share/mysql/test/include/sync_slave_sql_with_master.inc
 share/mysql/test/include/system_db_struct.inc
+share/mysql/test/include/system_tables_storage_engine_tests.inc
 share/mysql/test/include/test_fieldsize.inc
 share/mysql/test/include/test_ssl_verify_identity.inc
 share/mysql/test/include/testdb_only.inc
@@ -1232,12 +1375,23 @@ share/mysql/test/lib/mtr_report.pm
 share/mysql/test/lib/mtr_results.pm
 share/mysql/test/lib/mtr_stress.pl
 share/mysql/test/lib/mtr_unique.pm
+share/mysql/test/lib/t/Base.t
+share/mysql/test/lib/t/Find.t
+share/mysql/test/lib/t/Options.t
+share/mysql/test/lib/t/SafeProcess.t
+share/mysql/test/lib/t/SafeProcessStress.pl
+share/mysql/test/lib/t/copytree.t
+share/mysql/test/lib/t/dummyd.pl
+share/mysql/test/lib/t/rmtree.t
+share/mysql/test/lib/t/testMyConfig.t
+share/mysql/test/lib/t/testMyConfigFactory.t
+share/mysql/test/lib/t/test_child.pl
 share/mysql/test/lock_order_dependencies.txt
 share/mysql/test/lsan.supp
 share/mysql/test/mtr
 share/mysql/test/mysql-stress-test.pl
-share/mysql/test/mysql-test-run
 share/mysql/test/mysql-test-run.dox
+share/mysql/test/mysql-test-run
 share/mysql/test/mysql-test-run.pl
 share/mysql/test/r/1st.result
 share/mysql/test/r/admin_interface.result
@@ -1254,6 +1408,7 @@ share/mysql/test/r/alter_table.result
 share/mysql/test/r/alter_table_myisam.result
 share/mysql/test/r/alter_table_partition.result
 share/mysql/test/r/analyze.result
+share/mysql/test/r/analyze_debug.result
 share/mysql/test/r/analyze_myisam.result
 share/mysql/test/r/ansi.result
 share/mysql/test/r/archive.result
@@ -1265,13 +1420,16 @@ share/mysql/test/r/archive_plugin.result
 share/mysql/test/r/archive_skip_lock_nowait.result
 share/mysql/test/r/archive_symlink.result
 share/mysql/test/r/async_client.result
+share/mysql/test/r/async_compress_client.result
 share/mysql/test/r/auth_rpl.result
 share/mysql/test/r/auto_increment.result
 share/mysql/test/r/bad_alloc.result
 share/mysql/test/r/basedir.result
 share/mysql/test/r/bench_count_distinct.result
 share/mysql/test/r/big_packets.result
+share/mysql/test/r/big_packets_async.result
 share/mysql/test/r/big_packets_boundary.result
+share/mysql/test/r/big_packets_boundary_async.result
 share/mysql/test/r/bigint.result
 share/mysql/test/r/binary.result
 share/mysql/test/r/binary_to_hex.result
@@ -1347,6 +1505,8 @@ share/mysql/test/r/create.result
 share/mysql/test/r/create_myisam.result
 share/mysql/test/r/create_not_windows.result
 share/mysql/test/r/create_ps_protocol.result
+share/mysql/test/r/create_select_atomic.result
+share/mysql/test/r/create_select_foreign_key.result
 share/mysql/test/r/create_select_tmp.result
 share/mysql/test/r/create_select_tmp_myisam.result
 share/mysql/test/r/create_w_max_indexes_64.result
@@ -1426,7 +1586,6 @@ share/mysql/test/r/ctype_utf8mb4_heap.result
 share/mysql/test/r/ctype_utf8mb4_innodb.result
 share/mysql/test/r/ctype_utf8mb4_myisam.result
 share/mysql/test/r/ctype_utf8mb4_uca.result
-share/mysql/test/r/daemonize_opt.result
 share/mysql/test/r/datadir_permission.result
 share/mysql/test/r/date_formats.result
 share/mysql/test/r/dd_bootstrap.result
@@ -1444,6 +1603,7 @@ share/mysql/test/r/dd_is_debug_myisam.result
 share/mysql/test/r/dd_is_gcov.result
 share/mysql/test/r/dd_is_gcov_myisam.result
 share/mysql/test/r/dd_is_view_usage.result
+share/mysql/test/r/dd_pfs.result
 share/mysql/test/r/dd_schema_dd_properties_debug.result
 share/mysql/test/r/dd_schema_definition_after_upgrade_57_debug.result
 share/mysql/test/r/dd_schema_definition_after_upgrade_80_debug.result
@@ -1482,9 +1642,9 @@ share/mysql/test/r/delete_myisam.result
 share/mysql/test/r/deprecate_eof.result
 share/mysql/test/r/deprecated_features.result
 share/mysql/test/r/deprecation_56.result
-share/mysql/test/r/derived-no-prepared.result
 share/mysql/test/r/derived.result
 share/mysql/test/r/derived_ci.result
+share/mysql/test/r/derived_condition_pushdown.result
 share/mysql/test/r/derived_correlated.result
 share/mysql/test/r/derived_cs.result
 share/mysql/test/r/derived_limit.result
@@ -1492,6 +1652,7 @@ share/mysql/test/r/desc_index_innodb.result
 share/mysql/test/r/dictionary_tablespace.result
 share/mysql/test/r/dictionary_timestamp.result
 share/mysql/test/r/dirty_close.result
+share/mysql/test/r/disable_drop_rename_user.result
 share/mysql/test/r/disabled_replication.result
 share/mysql/test/r/disabled_storage_engines.result
 share/mysql/test/r/disconnect_on_expired_password_default.result
@@ -1504,6 +1665,8 @@ share/mysql/test/r/ds_mrr-big.result
 share/mysql/test/r/empty_table.result
 share/mysql/test/r/enable_cleartext_plugin.result
 share/mysql/test/r/endspace.result
+share/mysql/test/r/engine_attribute.result
+share/mysql/test/r/engine_attribute_debug.result
 share/mysql/test/r/eq_range_idx_stat.result
 share/mysql/test/r/error_logging_verbosity.result
 share/mysql/test/r/error_simulation.result
@@ -1576,7 +1739,9 @@ share/mysql/test/r/func_aes_cfb128.result
 share/mysql/test/r/func_aes_cfb8.result
 share/mysql/test/r/func_aes_misc.result
 share/mysql/test/r/func_aes_ofb.result
+share/mysql/test/r/func_at_time_zone.result
 share/mysql/test/r/func_bitwise_ops.result
+share/mysql/test/r/func_comparison.result
 share/mysql/test/r/func_compress.result
 share/mysql/test/r/func_concat.result
 share/mysql/test/r/func_date_add.result
@@ -1602,6 +1767,7 @@ share/mysql/test/r/func_math.result
 share/mysql/test/r/func_misc.result
 share/mysql/test/r/func_op.result
 share/mysql/test/r/func_prefix_key.result
+share/mysql/test/r/func_rand.result
 share/mysql/test/r/func_regexp.result
 share/mysql/test/r/func_rollback.result
 share/mysql/test/r/func_sapdb.result
@@ -1638,6 +1804,9 @@ share/mysql/test/r/grant_alter_user.result
 share/mysql/test/r/grant_alter_user_qa.result
 share/mysql/test/r/grant_debug.result
 share/mysql/test/r/grant_dynamic.result
+share/mysql/test/r/grant_dynamic_bugs.result
+share/mysql/test/r/grant_dynamic_flush.result
+share/mysql/test/r/grant_dynamic_flush_upgrade.result
 share/mysql/test/r/grant_dynamic_session_variables_admin.result
 share/mysql/test/r/grant_explain_non_select.result
 share/mysql/test/r/grant_lowercase_fs.result
@@ -1649,6 +1818,7 @@ share/mysql/test/r/group_by.result
 share/mysql/test/r/group_by_fd_no_prot.result
 share/mysql/test/r/group_by_fd_ps_prot.result
 share/mysql/test/r/group_min_max.result
+share/mysql/test/r/group_min_max_ext-debug.result
 share/mysql/test/r/group_min_max_ext.result
 share/mysql/test/r/group_min_max_innodb.result
 share/mysql/test/r/group_min_max_ps_protocol.result
@@ -1676,6 +1846,8 @@ share/mysql/test/r/histograms.result
 share/mysql/test/r/histograms_debug.result
 share/mysql/test/r/host_cache_size_functionality.result
 share/mysql/test/r/hostname_length.result
+share/mysql/test/r/hostname_length_ipv4.result
+share/mysql/test/r/hostname_length_ipv6.result
 share/mysql/test/r/ignore_strict.result
 share/mysql/test/r/implicit_char_to_num_conversion.result
 share/mysql/test/r/implicit_commit.result
@@ -1686,6 +1858,7 @@ share/mysql/test/r/import_schema_mismatch.result
 share/mysql/test/r/import_symlink.result
 share/mysql/test/r/inconsistent_scan.result
 share/mysql/test/r/index_merge_bug29952775.result
+share/mysql/test/r/index_merge_bugs.result
 share/mysql/test/r/index_merge_delete.result
 share/mysql/test/r/index_merge_innodb.result
 share/mysql/test/r/index_merge_insert-and-replace.result
@@ -1751,6 +1924,8 @@ share/mysql/test/r/insert_update_myisam.result
 share/mysql/test/r/internal_tmp_disk_storage_engine.result
 share/mysql/test/r/invalid_collation.result
 share/mysql/test/r/invalid_text_sort.result
+share/mysql/test/r/invisible_columns.result
+share/mysql/test/r/invisible_columns_myisam.result
 share/mysql/test/r/invisible_indexes.result
 share/mysql/test/r/invisible_indexes_myisam.result
 share/mysql/test/r/ipv4_as_ipv6.result
@@ -1778,6 +1953,7 @@ share/mysql/test/r/key_primary.result
 share/mysql/test/r/keywords.result
 share/mysql/test/r/kill.result
 share/mysql/test/r/kill_debug.result
+share/mysql/test/r/kill_explain_analyze.result
 share/mysql/test/r/kill_myisam.result
 share/mysql/test/r/lead_lag.result
 share/mysql/test/r/lead_lag_explain.result
@@ -1824,9 +2000,11 @@ share/mysql/test/r/log_tables.result
 share/mysql/test/r/log_tables_debug.result
 share/mysql/test/r/log_tables_myisam.result
 share/mysql/test/r/log_tables_upgrade.result
+share/mysql/test/r/log_timestamp_ts.result
 share/mysql/test/r/log_timestamps.result
 share/mysql/test/r/long_table_name.result
 share/mysql/test/r/long_tmpdir.result
+share/mysql/test/r/loose_scan.result
 share/mysql/test/r/lowercase_fs_off.result
 share/mysql/test/r/lowercase_fs_on.result
 share/mysql/test/r/lowercase_mixed_tmpdir.result
@@ -1851,6 +2029,7 @@ share/mysql/test/r/metadata.result
 share/mysql/test/r/metadata_myisam.result
 share/mysql/test/r/mix2_myisam.result
 share/mysql/test/r/mix2_myisam_ucs2.result
+share/mysql/test/r/mtr_unit_tests.result
 share/mysql/test/r/multi_plugin_load.result
 share/mysql/test/r/multi_plugin_load_add.result
 share/mysql/test/r/multi_plugin_load_add2.result
@@ -1880,6 +2059,7 @@ share/mysql/test/r/myisam_mrr_cost_all.result
 share/mysql/test/r/myisam_mrr_cost_icp.result
 share/mysql/test/r/myisam_mrr_icp.result
 share/mysql/test/r/myisam_mrr_none.result
+share/mysql/test/r/myisam_optimize_table.result
 share/mysql/test/r/myisam_recover.result
 share/mysql/test/r/myisam_row_rpl.result
 share/mysql/test/r/myisam_skip_lock_nowait.result
@@ -1889,12 +2069,14 @@ share/mysql/test/r/mysql-bug45236.result
 share/mysql/test/r/mysql.result
 share/mysql/test/r/mysql_57_inplace_upgrade.result
 share/mysql/test/r/mysql_80_inplace_upgrade.result
+share/mysql/test/r/mysql_batch_mode.result
 share/mysql/test/r/mysql_binary_mode.result
 share/mysql/test/r/mysql_client_test.result
 share/mysql/test/r/mysql_comments.result
 share/mysql/test/r/mysql_config_editor.result
 share/mysql/test/r/mysql_cp932.result
 share/mysql/test/r/mysql_inplace_upgrade.result
+share/mysql/test/r/mysql_load_data_local_dir.result
 share/mysql/test/r/mysql_locale_posix.result
 share/mysql/test/r/mysql_not_windows.result
 share/mysql/test/r/mysql_os_user.result
@@ -1938,6 +2120,7 @@ share/mysql/test/r/mysqldump-compat.result
 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_bug29998457.result
 share/mysql/test/r/mysqldump_bugs.result
 share/mysql/test/r/mysqldump_gtid.result
 share/mysql/test/r/mysqldump_myisam.result
@@ -1961,6 +2144,7 @@ share/mysql/test/r/mysqlshow_ci.result
 share/mysql/test/r/mysqlshow_cs.result
 share/mysql/test/r/mysqlslap.result
 share/mysql/test/r/mysqltest.result
+share/mysql/test/r/mysqltest_escape.result
 share/mysql/test/r/named_pipe.result
 share/mysql/test/r/negation_elimination.result
 share/mysql/test/r/no-threads.result
@@ -2002,6 +2186,7 @@ share/mysql/test/r/opt_costmodel_upgrade.result
 share/mysql/test/r/opt_costmodel_warnings.result
 share/mysql/test/r/opt_hint_timeout.result
 share/mysql/test/r/opt_hints.result
+share/mysql/test/r/opt_hints_index.result
 share/mysql/test/r/opt_hints_index_merge.result
 share/mysql/test/r/opt_hints_join_order.result
 share/mysql/test/r/opt_hints_join_order_myisam.result
@@ -2019,6 +2204,7 @@ share/mysql/test/r/order_by_none.result
 share/mysql/test/r/order_by_sortkey.result
 share/mysql/test/r/order_fill_sortbuf.result
 share/mysql/test/r/outfile.result
+share/mysql/test/r/outfile_fsync_debug.result
 share/mysql/test/r/outfile_loaddata.result
 share/mysql/test/r/overflow.result
 share/mysql/test/r/packet.result
@@ -2067,6 +2253,7 @@ share/mysql/test/r/partition_not_supported.result
 share/mysql/test/r/partition_not_supported_myisam.result
 share/mysql/test/r/partition_not_windows.result
 share/mysql/test/r/partition_order.result
+share/mysql/test/r/partition_prefixkey_upgrade.result
 share/mysql/test/r/partition_pruning.result
 share/mysql/test/r/partition_range.result
 share/mysql/test/r/partition_rename_longfilename.result
@@ -2120,8 +2307,10 @@ share/mysql/test/r/ps_ddl_myisam.result
 share/mysql/test/r/ps_grant.result
 share/mysql/test/r/ps_not_windows.result
 share/mysql/test/r/ps_sys_upgrade.result
+share/mysql/test/r/ps_type_deduction.result
 share/mysql/test/r/ps_w_max_indexes_64.result
 share/mysql/test/r/ps_w_max_indexes_64_myisam.result
+share/mysql/test/r/query_attributes.result
 share/mysql/test/r/range_all.result
 share/mysql/test/r/range_icp.result
 share/mysql/test/r/range_icp_mrr.result
@@ -2166,6 +2355,7 @@ share/mysql/test/r/rewrite_general_log.result
 share/mysql/test/r/rewrite_slow_log.result
 share/mysql/test/r/roles-admin.result
 share/mysql/test/r/roles-ddl.result
+share/mysql/test/r/roles-sp-case.result
 share/mysql/test/r/roles-sp.result
 share/mysql/test/r/roles-upgrade.result
 share/mysql/test/r/roles-view.result
@@ -2173,6 +2363,7 @@ share/mysql/test/r/roles.result
 share/mysql/test/r/roles2.result
 share/mysql/test/r/roles_bugs.result
 share/mysql/test/r/roles_bugs_debug.result
+share/mysql/test/r/roles_bugs_wildcard.result
 share/mysql/test/r/rollback.result
 share/mysql/test/r/rollback_myisam.result
 share/mysql/test/r/round.result
@@ -2187,6 +2378,9 @@ share/mysql/test/r/rpl_password_history.result
 share/mysql/test/r/savepoint_debug.result
 share/mysql/test/r/schema.result
 share/mysql/test/r/schema_myisam.result
+share/mysql/test/r/schema_read_only_ci.result
+share/mysql/test/r/schema_read_only_cs.result
+share/mysql/test/r/sdi_tablespace.result
 share/mysql/test/r/sdi_utf8.result
 share/mysql/test/r/secure_file_priv_win.result
 share/mysql/test/r/select_all.result
@@ -2313,6 +2507,8 @@ share/mysql/test/r/subquery_nomat_nosj_bka_nobnl.result
 share/mysql/test/r/subquery_none.result
 share/mysql/test/r/subquery_none_bka.result
 share/mysql/test/r/subquery_none_bka_nobnl.result
+share/mysql/test/r/subquery_scalar_to_derived.result
+share/mysql/test/r/subquery_scalar_to_derived_correlated.result
 share/mysql/test/r/subquery_sj_all.result
 share/mysql/test/r/subquery_sj_all_bka.result
 share/mysql/test/r/subquery_sj_all_bka_nobnl.result
@@ -2338,6 +2534,7 @@ share/mysql/test/r/subquery_sj_mat_nosj.result
 share/mysql/test/r/subquery_sj_none.result
 share/mysql/test/r/subquery_sj_none_bka.result
 share/mysql/test/r/subquery_sj_none_bka_nobnl.result
+share/mysql/test/r/subquery_table_to_derived.result
 share/mysql/test/r/subselect.result
 share/mysql/test/r/subselect_debug.result
 share/mysql/test/r/subselect_gis.result
@@ -2349,6 +2546,9 @@ share/mysql/test/r/synchronization.result
 share/mysql/test/r/sysdate_is_now.result
 share/mysql/test/r/system_mysql_db.result
 share/mysql/test/r/system_mysql_db_refs.result
+share/mysql/test/r/system_tables_myisam.result
+share/mysql/test/r/system_tables_myisam_lctn_1.result
+share/mysql/test/r/system_tables_myisam_lctn_2.result
 share/mysql/test/r/system_variable_source.result
 share/mysql/test/r/table_definition_cache_functionality.result
 share/mysql/test/r/table_lock_skip_lock_nowait.result
@@ -2364,7 +2564,6 @@ share/mysql/test/r/temporal_literal.result
 share/mysql/test/r/temptable.result
 share/mysql/test/r/temptable_basic.result
 share/mysql/test/r/temptable_disk.result
-share/mysql/test/r/temptable_embedded_unit_tests.result
 share/mysql/test/r/temptable_error_injection.result
 share/mysql/test/r/temptable_fallback.result
 share/mysql/test/r/temptable_myisam.result
@@ -2382,6 +2581,7 @@ share/mysql/test/r/time_zone4.result
 share/mysql/test/r/time_zone_debug.result
 share/mysql/test/r/time_zone_grant.result
 share/mysql/test/r/time_zone_with_dst.result
+share/mysql/test/r/tmpdir.result
 share/mysql/test/r/trans_read_only.result
 share/mysql/test/r/transactional_acl_tables.result
 share/mysql/test/r/trigger-compat-debug.result
@@ -2426,7 +2626,6 @@ share/mysql/test/r/type_uint.result
 share/mysql/test/r/type_varchar.result
 share/mysql/test/r/type_year.result
 share/mysql/test/r/udf.result
-share/mysql/test/r/udf_myisam.result
 share/mysql/test/r/udf_services.result
 share/mysql/test/r/udf_skip_grants.result
 share/mysql/test/r/undo_tablespace.result
@@ -2435,11 +2634,14 @@ share/mysql/test/r/union.result
 share/mysql/test/r/union_myisam.result
 share/mysql/test/r/unique_option_prefixes.result
 share/mysql/test/r/unsafe_binlog_innodb.result
+share/mysql/test/r/upd_del_single_to_multi.result
 share/mysql/test/r/update.result
 share/mysql/test/r/update_myisam.result
 share/mysql/test/r/upgrade.result
+share/mysql/test/r/upgrade_system_tables.result
 share/mysql/test/r/user_account_password_lock.result
 share/mysql/test/r/user_account_password_lock_dbug.result
+share/mysql/test/r/user_comment.result
 share/mysql/test/r/user_if_exists.result
 share/mysql/test/r/user_limits.result
 share/mysql/test/r/user_lock.result
@@ -2500,6 +2702,7 @@ share/mysql/test/r/xa_gtid.result
 share/mysql/test/r/xa_mdl_backup.result
 share/mysql/test/r/xa_prepared_binlog_off.result
 share/mysql/test/r/xml.result
+share/mysql/test/r/xml_report_invalid_chars.result
 share/mysql/test/r/year-csv.result
 share/mysql/test/r/year-innodb.result
 share/mysql/test/r/year-memory.result
@@ -2521,8 +2724,11 @@ share/mysql/test/std_data/Japan
 share/mysql/test/std_data/Moscow_leap
 share/mysql/test/std_data/README_tablespace_portable_linux.txt
 share/mysql/test/std_data/README_tablespace_portable_win.text
+share/mysql/test/std_data/acl.csv
+share/mysql/test/std_data/alter_table.csv
 share/mysql/test/std_data/bad_gis_data.dat
 share/mysql/test/std_data/binlog_56_gtid_reserved_word.000001
+share/mysql/test/std_data/binlog_compression.gz
 share/mysql/test/std_data/binlog_no_fd_event.000001
 share/mysql/test/std_data/binlog_savepoint.000001
 share/mysql/test/std_data/binlog_transaction.000001
@@ -2544,6 +2750,7 @@ share/mysql/test/std_data/bug26412713.csv
 share/mysql/test/std_data/bug27213339-bin.000001
 share/mysql/test/std_data/bug30435_10k_items.txt
 share/mysql/test/std_data/bug30435_5k.txt
+share/mysql/test/std_data/bug30753708.dat
 share/mysql/test/std_data/bug33029-slave-relay-bin.000001
 share/mysql/test/std_data/bug35469.dat
 share/mysql/test/std_data/bug37631.MYD
@@ -2575,6 +2782,7 @@ share/mysql/test/std_data/comp_err/msg_start_too_low.txt
 share/mysql/test/std_data/corrupt-relay-bin.000624
 share/mysql/test/std_data/corrupt_t1#P#p1.MYI
 share/mysql/test/std_data/corrupt_t1.MYI
+share/mysql/test/std_data/crc32_endianness.zip
 share/mysql/test/std_data/crl-ca-cert.pem
 share/mysql/test/std_data/crl-certificate-readme.txt
 share/mysql/test/std_data/crl-client-cert.pem
@@ -2584,14 +2792,21 @@ share/mysql/test/std_data/crl-client-revoked-key.pem
 share/mysql/test/std_data/crl-client-revoked.crl
 share/mysql/test/std_data/crl-server-cert.pem
 share/mysql/test/std_data/crl-server-key.pem
-share/mysql/test/std_data/crldir/b23bb52f.r0
+share/mysql/test/std_data/crl-server-revoked-cert.pem
+share/mysql/test/std_data/crl-server-revoked-key.pem
+share/mysql/test/std_data/crl-server-revoked.crl
+share/mysql/test/std_data/crldir/5df06fcb.r0
 share/mysql/test/std_data/data57.zip
+share/mysql/test/std_data/data57_drop_fts.zip
 share/mysql/test/std_data/data57_enum.zip
 share/mysql/test/std_data/data57_fts_aux.zip
 share/mysql/test/std_data/data57_fts_lctn.zip
 share/mysql/test/std_data/data57_fts_nolctn.zip
+share/mysql/test/std_data/data57_fts_shared_tablespace.zip
+share/mysql/test/std_data/data57_index_stats.zip
 share/mysql/test/std_data/data57_partition.zip
 share/mysql/test/std_data/data57_partition_prefix_key.zip
+share/mysql/test/std_data/data57_unknown_dir.zip
 share/mysql/test/std_data/data57_upgrade_default_timezone_bug.zip
 share/mysql/test/std_data/data57_upgrade_groupby_desc.zip
 share/mysql/test/std_data/data57_upgrade_innodb_4k.zip
@@ -2600,6 +2815,13 @@ share/mysql/test/std_data/data76.zip
 share/mysql/test/std_data/data80011_upgrade_groupby_desc_ci_mac.zip
 share/mysql/test/std_data/data80011_upgrade_groupby_desc_ci_win.zip
 share/mysql/test/std_data/data80011_upgrade_groupby_desc_cs.zip
+share/mysql/test/std_data/data80019_partition_prefix_key.zip
+share/mysql/test/std_data/data80021_autoextend_size.zip
+share/mysql/test/std_data/data_57.zip
+share/mysql/test/std_data/data_8021.zip
+share/mysql/test/std_data/data_geometry_56.zip
+share/mysql/test/std_data/datadir_tablespace_linux.zip
+share/mysql/test/std_data/datadir_tablespace_windows.zip
 share/mysql/test/std_data/dd/sdi/innodb_index_debug/t1.json
 share/mysql/test/std_data/dd/sdi/innodb_sdi/ibdata1.json
 share/mysql/test/std_data/dd/sdi/innodb_sdi/mysql.json
@@ -2664,6 +2886,34 @@ share/mysql/test/std_data/dd/sdi/upgrade_partition/sys_config.json
 share/mysql/test/std_data/dd/sdi/upgrade_partition/t1#p#p0.json
 share/mysql/test/std_data/dd/sdi/upgrade_partition/t1#p#p1.json
 share/mysql/test/std_data/des_key_file
+share/mysql/test/std_data/ecdh_dsa_certs/ca-key.pem
+share/mysql/test/std_data/ecdh_dsa_certs/ca-params.pem
+share/mysql/test/std_data/ecdh_dsa_certs/ca-req.pem
+share/mysql/test/std_data/ecdh_dsa_certs/cacert.pem
+share/mysql/test/std_data/ecdh_dsa_certs/dsa.csr
+share/mysql/test/std_data/ecdh_dsa_certs/server-cert.pem
+share/mysql/test/std_data/ecdh_dsa_certs/server-dsa-key.pem
+share/mysql/test/std_data/ecdh_dsa_certs/server-ecparam.pem
+share/mysql/test/std_data/ecdh_dsa_certs/server-key.pem
+share/mysql/test/std_data/ecdh_dsa_certs/server-params.pem
+share/mysql/test/std_data/ecdh_dsa_certs/server-pubkey.pem
+share/mysql/test/std_data/ecdh_rsa_certs/ca-key.pem
+share/mysql/test/std_data/ecdh_rsa_certs/cacert.pem
+share/mysql/test/std_data/ecdh_rsa_certs/rsa.csr
+share/mysql/test/std_data/ecdh_rsa_certs/rsakey.pem
+share/mysql/test/std_data/ecdh_rsa_certs/server-cert.pem
+share/mysql/test/std_data/ecdh_rsa_certs/server-ecparam.pem
+share/mysql/test/std_data/ecdh_rsa_certs/server-key.pem
+share/mysql/test/std_data/ecdh_rsa_certs/server-pubkey.pem
+share/mysql/test/std_data/ecdsa_certs/ca-ecparam.pem
+share/mysql/test/std_data/ecdsa_certs/ca-key.pem
+share/mysql/test/std_data/ecdsa_certs/ca-pubkey.pem
+share/mysql/test/std_data/ecdsa_certs/cacert.pem
+share/mysql/test/std_data/ecdsa_certs/ecdsa.csr
+share/mysql/test/std_data/ecdsa_certs/server-cert.pem
+share/mysql/test/std_data/ecdsa_certs/server-ecparam.pem
+share/mysql/test/std_data/ecdsa_certs/server-key.pem
+share/mysql/test/std_data/ecdsa_certs/server-pubkey.pem
 share/mysql/test/std_data/expired-ca-key.pem
 share/mysql/test/std_data/expired-ca.pem
 share/mysql/test/std_data/expired-client-cert.pem
@@ -2696,6 +2946,9 @@ share/mysql/test/std_data/fw_data_57.zip
 share/mysql/test/std_data/fw_data_80016.zip
 share/mysql/test/std_data/hostname_in_grantor.sql
 share/mysql/test/std_data/hostname_in_perfschema.sql
+share/mysql/test/std_data/import2_8021.zip
+share/mysql/test/std_data/import_8021.zip
+share/mysql/test/std_data/import_compression_8_0_23.zip
 share/mysql/test/std_data/inconsistent_scan.csv
 share/mysql/test/std_data/init-file-rpl-filter.dat
 share/mysql/test/std_data/init_file.dat
@@ -2719,8 +2972,24 @@ share/mysql/test/std_data/loaddata_utf8.dat
 share/mysql/test/std_data/loadxml.dat
 share/mysql/test/std_data/loadxml2.dat
 share/mysql/test/std_data/lob/earth215kb.jpg
+share/mysql/test/std_data/log_corruption/log_corruption.zip
+share/mysql/test/std_data/log_corruption/log_corruption0.zip
+share/mysql/test/std_data/log_corruption/log_corruption1.zip
+share/mysql/test/std_data/log_corruption/log_corruption2.zip
+share/mysql/test/std_data/log_corruption/log_corruption3.zip
+share/mysql/test/std_data/log_corruption/log_corruption4.zip
+share/mysql/test/std_data/log_corruption/log_corruption4a.zip
+share/mysql/test/std_data/log_corruption/log_corruption4b.zip
+share/mysql/test/std_data/log_corruption/log_corruption4c.zip
+share/mysql/test/std_data/log_corruption/log_corruption4d.zip
+share/mysql/test/std_data/log_corruption/log_corruption5.zip
+share/mysql/test/std_data/log_corruption/log_corruption6.zip
+share/mysql/test/std_data/log_corruption/log_corruption6b.zip
+share/mysql/test/std_data/log_corruption/log_corruption7.zip
+share/mysql/test/std_data/log_corruption/log_corruption_1.zip
 share/mysql/test/std_data/master-bin.000001
 share/mysql/test/std_data/mylogin-bad-cipher.cnf
+share/mysql/test/std_data/mysqldump_57.sql
 share/mysql/test/std_data/new_certs_for_bad_host/ca-bad-host.pem
 share/mysql/test/std_data/new_certs_for_bad_host/ca-key-bad-host.pem
 share/mysql/test/std_data/new_certs_for_bad_host/server-cert-bad-host.pem
@@ -2746,6 +3015,7 @@ share/mysql/test/std_data/parts/t1_will_crash#P#p4.MYI
 share/mysql/test/std_data/parts/t1_will_crash#P#p6.MYD
 share/mysql/test/std_data/parts/t1_will_crash#P#p6_2.MYD
 share/mysql/test/std_data/parts/t1_will_crash#P#p6_3.MYD
+share/mysql/test/std_data/plugin_keyring_file_data
 share/mysql/test/std_data/rpl_atomic_ddl_rollback_full.000001
 share/mysql/test/std_data/rpl_atomic_ddl_rollback_table.000001
 share/mysql/test/std_data/rpl_atomic_ddl_rollback_view.000001
@@ -2786,20 +3056,23 @@ share/mysql/test/std_data/t_gcol_dep.frm
 share/mysql/test/std_data/t_set.frm
 share/mysql/test/std_data/table_encrypted_32.zip
 share/mysql/test/std_data/table_encrypted_64.zip
-share/mysql/test/std_data/tablespace_portable_linux.zip
-share/mysql/test/std_data/tablespace_portable_win.zip
 share/mysql/test/std_data/untrusted-cacert.pem
 share/mysql/test/std_data/upgrade/80016_subpart.zip
 share/mysql/test/std_data/upgrade/bug29791350_upgrade_57022.zip
 share/mysql/test/std_data/upgrade/bug29996434_upgrade_57022.zip
 share/mysql/test/std_data/upgrade/bugdata_80011.zip
 share/mysql/test/std_data/upgrade/data_57022.zip
+share/mysql/test/std_data/upgrade/data_57_clean.zip
+share/mysql/test/std_data/upgrade/data_57_clone_lin.zip
+share/mysql/test/std_data/upgrade/data_57_help_tables.zip
 share/mysql/test/std_data/upgrade/data_57_lctn0_cs_lin.zip
 share/mysql/test/std_data/upgrade/data_57_lctn1_ci_mac.zip
 share/mysql/test/std_data/upgrade/data_57_lctn1_ci_win.zip
 share/mysql/test/std_data/upgrade/data_57_lctn1_cs_lin.zip
 share/mysql/test/std_data/upgrade/data_57_lctn2_ci_mac.zip
 share/mysql/test/std_data/upgrade/data_57_lctn2_ci_win.zip
+share/mysql/test/std_data/upgrade/data_57_orphan_event.zip
+share/mysql/test/std_data/upgrade/data_57_orphan_routine.zip
 share/mysql/test/std_data/upgrade/data_80011.zip
 share/mysql/test/std_data/upgrade/data_80011_ci_mac.zip
 share/mysql/test/std_data/upgrade/data_80011_ci_win.zip
@@ -2833,6 +3106,8 @@ share/mysql/test/std_data/upgrade/data_wl13352_8019_mac_lctn_1.zip
 share/mysql/test/std_data/upgrade/data_wl13352_8019_mac_lctn_2.zip
 share/mysql/test/std_data/upgrade/data_wl13352_8019_win_lctn_1.zip
 share/mysql/test/std_data/upgrade/data_wl13352_8019_win_lctn_2.zip
+share/mysql/test/std_data/upgrade/discarded_partition_data_5730.zip
+share/mysql/test/std_data/upgrade/discarded_partition_data_8020.zip
 share/mysql/test/std_data/upgrade/export_wl13352_8013.zip
 share/mysql/test/std_data/upgrade/export_wl13352_8015.zip
 share/mysql/test/std_data/upgrade/export_wl13352_8017.zip
@@ -2856,6 +3131,7 @@ share/mysql/test/std_data/upgrade/wl12261_upgrade_80012.zip
 share/mysql/test/std_data/upgrade/wl12261_upgrade_80013.zip
 share/mysql/test/std_data/warnings_loaddata.dat
 share/mysql/test/std_data/wl12261_dump.zip
+share/mysql/test/std_data/wl13681.json
 share/mysql/test/std_data/wl5766_data.txt
 share/mysql/test/std_data/wl6030.dat
 share/mysql/test/std_data/wl6030_2.dat
@@ -2875,6 +3151,7 @@ share/mysql/test/suite/audit_null/r/message_internal.result
 share/mysql/test/suite/audit_null/r/message_internal_abort.result
 share/mysql/test/suite/audit_null/r/message_user.result
 share/mysql/test/suite/audit_null/r/message_user_abort.result
+share/mysql/test/suite/audit_null/r/mysqlx_abort.result
 share/mysql/test/suite/audit_null/t/audit_plugin-master.opt
 share/mysql/test/suite/audit_null/t/audit_plugin.test
 share/mysql/test/suite/audit_null/t/audit_plugin_2-master.opt
@@ -2900,8 +3177,19 @@ share/mysql/test/suite/audit_null/t/message_user-master.opt
 share/mysql/test/suite/audit_null/t/message_user.test
 share/mysql/test/suite/audit_null/t/message_user_abort-master.opt
 share/mysql/test/suite/audit_null/t/message_user_abort.test
+share/mysql/test/suite/audit_null/t/mysqlx_abort-master.opt
+share/mysql/test/suite/audit_null/t/mysqlx_abort.test
+share/mysql/test/suite/auth_sec/include/acl_table_read_test_dml_ddl.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_big_debug_1.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_big_debug_2.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_big_debug_helper.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_big_negative.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_big_positive.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_locking_tests_helper.inc
+share/mysql/test/suite/auth_sec/include/acl_tables_row_locking.inc
 share/mysql/test/suite/auth_sec/include/auth_sec_assert_binlog_events.inc
 share/mysql/test/suite/auth_sec/include/auth_show_binlog_events.inc
+share/mysql/test/suite/auth_sec/include/cipher_test.inc
 share/mysql/test/suite/auth_sec/include/grant_as_ddl.inc
 share/mysql/test/suite/auth_sec/include/have_sha256_rsa_auth.inc
 share/mysql/test/suite/auth_sec/include/multiple_passwords.inc
@@ -2912,11 +3200,27 @@ share/mysql/test/suite/auth_sec/include/partial_revokes_dml.inc
 share/mysql/test/suite/auth_sec/include/partial_revokes_rpl_helper.inc
 share/mysql/test/suite/auth_sec/include/password_require_current_non_priv_user.inc
 share/mysql/test/suite/auth_sec/include/password_require_current_priv_user.inc
+share/mysql/test/suite/auth_sec/include/plugin_auth_caching_sha2_password_digest_rounds.inc
 share/mysql/test/suite/auth_sec/include/plugin_auth_caching_sha2_password_tests.inc
 share/mysql/test/suite/auth_sec/include/plugin_auth_caching_sha2_password_tests_qa.inc
 share/mysql/test/suite/auth_sec/include/plugin_auth_caching_sha2_password_tests_shared_memory.inc
 share/mysql/test/suite/auth_sec/include/skip_grant_protocols.inc
 share/mysql/test/suite/auth_sec/r/access_credential_control.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_debug_1.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_debug_2.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_negative_rc.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_negative_rr.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_negative_ru.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_negative_ser.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_positive_rc.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_positive_rr.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_positive_ru.result
+share/mysql/test/suite/auth_sec/r/acl_tables_locking_big_positive_ser.result
+share/mysql/test/suite/auth_sec/r/acl_tables_row_locking.result
+share/mysql/test/suite/auth_sec/r/admin_channel_tls.result
+share/mysql/test/suite/auth_sec/r/admin_channel_tls_startup.result
+share/mysql/test/suite/auth_sec/r/admin_ssl_crl.result
+share/mysql/test/suite/auth_sec/r/admin_ssl_crl_crlpath.result
 share/mysql/test/suite/auth_sec/r/anonymous_grants.result
 share/mysql/test/suite/auth_sec/r/atomic_alter_roles.result
 share/mysql/test/suite/auth_sec/r/atomic_alter_user.result
@@ -2933,9 +3237,13 @@ share/mysql/test/suite/auth_sec/r/atomic_routine_grants.result
 share/mysql/test/suite/auth_sec/r/atomic_table_column_grants.result
 share/mysql/test/suite/auth_sec/r/cert_verify.result
 share/mysql/test/suite/auth_sec/r/cert_verify_openssl.result
+share/mysql/test/suite/auth_sec/r/cipher_support.result
 share/mysql/test/suite/auth_sec/r/early_plugin_load.result
 share/mysql/test/suite/auth_sec/r/fips.result
+share/mysql/test/suite/auth_sec/r/flush_privileges.result
 share/mysql/test/suite/auth_sec/r/grant_as_ddl.result
+share/mysql/test/suite/auth_sec/r/host_sort.result
+share/mysql/test/suite/auth_sec/r/initialize_admin_channel.result
 share/mysql/test/suite/auth_sec/r/install_keyring_file.result
 share/mysql/test/suite/auth_sec/r/key_rotation.result
 share/mysql/test/suite/auth_sec/r/key_rotation_qa.result
@@ -2975,6 +3283,9 @@ share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_auto_generat
 share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default.result
 share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default_qa.result
 share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_default_shared_memory.result
+share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_20000.result
+share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_max.result
+share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_digest_rounds_min.result
 share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_qa.result
 share/mysql/test/suite/auth_sec/r/plugin_auth_caching_sha2_password_shared_memory.result
 share/mysql/test/suite/auth_sec/r/random_password.result
@@ -2999,9 +3310,29 @@ share/mysql/test/suite/auth_sec/r/tls.result
 share/mysql/test/suite/auth_sec/r/tls12_tls1.result
 share/mysql/test/suite/auth_sec/r/tls13_tls1.result
 share/mysql/test/suite/auth_sec/r/tlsv13.result
+share/mysql/test/suite/auth_sec/r/user_attributes_column.result
 share/mysql/test/suite/auth_sec/r/wrong_keyring_file_data.result
 share/mysql/test/suite/auth_sec/t/access_credential_control-master.opt
 share/mysql/test/suite/auth_sec/t/access_credential_control.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_debug_1.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_debug_2.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_negative_rc.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_negative_rr.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_negative_ru.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_negative_ser.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_positive_rc.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_positive_rr.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_positive_ru.test
+share/mysql/test/suite/auth_sec/t/acl_tables_locking_big_positive_ser.test
+share/mysql/test/suite/auth_sec/t/acl_tables_row_locking-master.opt
+share/mysql/test/suite/auth_sec/t/acl_tables_row_locking.test
+share/mysql/test/suite/auth_sec/t/admin_channel_tls.test
+share/mysql/test/suite/auth_sec/t/admin_channel_tls_startup-master.opt
+share/mysql/test/suite/auth_sec/t/admin_channel_tls_startup.test
+share/mysql/test/suite/auth_sec/t/admin_ssl_crl-master.opt
+share/mysql/test/suite/auth_sec/t/admin_ssl_crl.test
+share/mysql/test/suite/auth_sec/t/admin_ssl_crl_crlpath-master.opt
+share/mysql/test/suite/auth_sec/t/admin_ssl_crl_crlpath.test
 share/mysql/test/suite/auth_sec/t/anonymous_grants.test
 share/mysql/test/suite/auth_sec/t/atomic_alter_roles.test
 share/mysql/test/suite/auth_sec/t/atomic_alter_user.test
@@ -3018,10 +3349,14 @@ share/mysql/test/suite/auth_sec/t/atomic_routine_grants.test
 share/mysql/test/suite/auth_sec/t/atomic_table_column_grants.test
 share/mysql/test/suite/auth_sec/t/cert_verify.test
 share/mysql/test/suite/auth_sec/t/cert_verify_openssl.test
+share/mysql/test/suite/auth_sec/t/cipher_support.test
 share/mysql/test/suite/auth_sec/t/early_plugin_load-master.opt
 share/mysql/test/suite/auth_sec/t/early_plugin_load.test
 share/mysql/test/suite/auth_sec/t/fips.test
+share/mysql/test/suite/auth_sec/t/flush_privileges.test
 share/mysql/test/suite/auth_sec/t/grant_as_ddl.test
+share/mysql/test/suite/auth_sec/t/host_sort.test
+share/mysql/test/suite/auth_sec/t/initialize_admin_channel.test
 share/mysql/test/suite/auth_sec/t/install_keyring_file-master.opt
 share/mysql/test/suite/auth_sec/t/install_keyring_file.test
 share/mysql/test/suite/auth_sec/t/key_rotation.test
@@ -3088,6 +3423,12 @@ share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_default_qa-m
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_default_qa.test
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_default_shared_memory-master.opt
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_default_shared_memory.test
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_20000-master.opt
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_20000.test
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_max-master.opt
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_max.test
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_min-master.opt
+share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_digest_rounds_min.test
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_qa-master.opt
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_qa.test
 share/mysql/test/suite/auth_sec/t/plugin_auth_caching_sha2_password_shared_memory-master.opt
@@ -3127,6 +3468,7 @@ share/mysql/test/suite/auth_sec/t/tls.test
 share/mysql/test/suite/auth_sec/t/tls12_tls1.test
 share/mysql/test/suite/auth_sec/t/tls13_tls1.test
 share/mysql/test/suite/auth_sec/t/tlsv13.test
+share/mysql/test/suite/auth_sec/t/user_attributes_column.test
 share/mysql/test/suite/auth_sec/t/wrong_keyring_file_data-master.opt
 share/mysql/test/suite/auth_sec/t/wrong_keyring_file_data.test
 share/mysql/test/suite/binlog/combinations
@@ -3143,6 +3485,7 @@ share/mysql/test/suite/binlog/r/binlog_cache_write_failure.result
 share/mysql/test/suite/binlog/r/binlog_check_flush_log_assertion.result
 share/mysql/test/suite/binlog/r/binlog_checksum.result
 share/mysql/test/suite/binlog/r/binlog_collation_assert.result
+share/mysql/test/suite/binlog/r/binlog_compression_size_higher.result
 share/mysql/test/suite/binlog/r/binlog_crash_safe_ddl.result
 share/mysql/test/suite/binlog/r/binlog_crash_safe_master_checksum.result
 share/mysql/test/suite/binlog/r/binlog_crash_safe_master_checksum_myisam.result
@@ -3159,7 +3502,7 @@ share/mysql/test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_stmt.result
 share/mysql/test/suite/binlog/r/binlog_drop_temp_table_on_disconnect_stmt_myisam.result
 share/mysql/test/suite/binlog/r/binlog_encryption_random_access.result
 share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency_create_select_consistent.result
-share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency_create_select_violation.result
+share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency_nontrx_create_select_violation.result
 share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency_trx_nontrx_consistent.result
 share/mysql/test/suite/binlog/r/binlog_enforce_gtid_consistency_trx_nontrx_violation.result
 share/mysql/test/suite/binlog/r/binlog_error_action.result
@@ -3180,6 +3523,7 @@ share/mysql/test/suite/binlog/r/binlog_incident.result
 share/mysql/test/suite/binlog/r/binlog_index.result
 share/mysql/test/suite/binlog/r/binlog_innodb_row.result
 share/mysql/test/suite/binlog/r/binlog_innodb_row_myisam.result
+share/mysql/test/suite/binlog/r/binlog_invisible_columns.result
 share/mysql/test/suite/binlog/r/binlog_json_mysqlbinlog.result
 share/mysql/test/suite/binlog/r/binlog_killed.result
 share/mysql/test/suite/binlog/r/binlog_killed_simulate.result
@@ -3188,6 +3532,7 @@ share/mysql/test/suite/binlog/r/binlog_max_extension.result
 share/mysql/test/suite/binlog/r/binlog_max_flush_queue_time_warn.result
 share/mysql/test/suite/binlog/r/binlog_mix_insert_select_limit.result
 share/mysql/test/suite/binlog/r/binlog_mix_unsafe_default_expression_in_trigger.result
+share/mysql/test/suite/binlog/r/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.result
 share/mysql/test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql/test/suite/binlog/r/binlog_multi_valued_index.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
@@ -3198,9 +3543,12 @@ share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_filter.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_intvar.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_linux.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_raw.result
+share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_raw_rewrite_db.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_require_row_format_errors.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_require_row_format_output.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_rewrite_db.result
+share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_signedness_metadata.result
+share/mysql/test/suite/binlog/r/binlog_noop_dml_with_readonly.result
 share/mysql/test/suite/binlog/r/binlog_priv_checks_user_set_vars.result
 share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_stall.result
 share/mysql/test/suite/binlog/r/binlog_purge_binary_logs_to.result
@@ -3250,6 +3598,7 @@ share/mysql/test/suite/binlog/r/binlog_stm_ps.result
 share/mysql/test/suite/binlog/r/binlog_stm_row.result
 share/mysql/test/suite/binlog/r/binlog_stm_tmp_table.result
 share/mysql/test/suite/binlog/r/binlog_stm_unsafe_default_expression_in_trigger.result
+share/mysql/test/suite/binlog/r/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.result
 share/mysql/test/suite/binlog/r/binlog_stm_unsafe_warning.result
 share/mysql/test/suite/binlog/r/binlog_stm_user_variables.result
 share/mysql/test/suite/binlog/r/binlog_switch_inside_trans.result
@@ -3257,6 +3606,7 @@ share/mysql/test/suite/binlog/r/binlog_table_map_optional_metadata.result
 share/mysql/test/suite/binlog/r/binlog_temp_table_prevents_switch_session_binlog_format.result
 share/mysql/test/suite/binlog/r/binlog_temporary_tables_user_var_event.result
 share/mysql/test/suite/binlog/r/binlog_transaction_dependency_tracking_on_start.result
+share/mysql/test/suite/binlog/r/binlog_transaction_length.result
 share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_basic.result
 share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_clear_identifiers.result
 share/mysql/test/suite/binlog/r/binlog_transaction_write_set_savepoint_insert_overwrite_identifier.result
@@ -3277,6 +3627,8 @@ 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_trx_split_across_binlog.result
+share/mysql/test/suite/binlog/r/compression_extra.result
+share/mysql/test/suite/binlog/r/compression_incident_event.result
 share/mysql/test/suite/binlog/r/print_identified_with_as_hex.result
 share/mysql/test/suite/binlog/r/show_binlog_events_no_lock.result
 share/mysql/test/suite/binlog/std_data/bug11747887-bin.000003
@@ -3299,6 +3651,8 @@ share/mysql/test/suite/binlog/t/binlog_cache_write_failure.test
 share/mysql/test/suite/binlog/t/binlog_check_flush_log_assertion.test
 share/mysql/test/suite/binlog/t/binlog_checksum.test
 share/mysql/test/suite/binlog/t/binlog_collation_assert.test
+share/mysql/test/suite/binlog/t/binlog_compression_size_higher-master.opt
+share/mysql/test/suite/binlog/t/binlog_compression_size_higher.test
 share/mysql/test/suite/binlog/t/binlog_crash_safe_ddl-master.opt
 share/mysql/test/suite/binlog/t/binlog_crash_safe_ddl.test
 share/mysql/test/suite/binlog/t/binlog_crash_safe_master_checksum-master.opt
@@ -3319,7 +3673,7 @@ share/mysql/test/suite/binlog/t/binlog_drop_temp_table_on_disconnect_stmt_myisam
 share/mysql/test/suite/binlog/t/binlog_encryption_random_access-master.opt
 share/mysql/test/suite/binlog/t/binlog_encryption_random_access.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_consistent.test
-share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency_create_select_violation.test
+share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency_nontrx_create_select_violation.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_consistent.test
 share/mysql/test/suite/binlog/t/binlog_enforce_gtid_consistency_trx_nontrx_violation.test
 share/mysql/test/suite/binlog/t/binlog_error_action-master.opt
@@ -3348,6 +3702,7 @@ share/mysql/test/suite/binlog/t/binlog_index-master.opt
 share/mysql/test/suite/binlog/t/binlog_index.test
 share/mysql/test/suite/binlog/t/binlog_innodb_row.test
 share/mysql/test/suite/binlog/t/binlog_innodb_row_myisam.test
+share/mysql/test/suite/binlog/t/binlog_invisible_columns.test
 share/mysql/test/suite/binlog/t/binlog_json_mysqlbinlog.test
 share/mysql/test/suite/binlog/t/binlog_killed.test
 share/mysql/test/suite/binlog/t/binlog_killed_simulate-master.opt
@@ -3358,6 +3713,7 @@ share/mysql/test/suite/binlog/t/binlog_max_flush_queue_time_warn-master.opt
 share/mysql/test/suite/binlog/t/binlog_max_flush_queue_time_warn.test
 share/mysql/test/suite/binlog/t/binlog_mix_insert_select_limit.test
 share/mysql/test/suite/binlog/t/binlog_mix_unsafe_default_expression_in_trigger.test
+share/mysql/test/suite/binlog/t/binlog_mix_unsafe_read_acl_tables_in_dml_ddl.test
 share/mysql/test/suite/binlog/t/binlog_mixed_load_data.test
 share/mysql/test/suite/binlog/t/binlog_multi_valued_index.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog-cp932-master.opt
@@ -3369,9 +3725,12 @@ share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_filter.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_intvar.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_linux.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_raw.test
+share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_raw_rewrite_db.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_require_row_format_errors.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_require_row_format_output.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_rewrite_db.test
+share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_signedness_metadata.test
+share/mysql/test/suite/binlog/t/binlog_noop_dml_with_readonly.test
 share/mysql/test/suite/binlog/t/binlog_priv_checks_user_set_vars.test
 share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall-master.opt
 share/mysql/test/suite/binlog/t/binlog_purge_binary_logs_stall.test
@@ -3434,6 +3793,7 @@ share/mysql/test/suite/binlog/t/binlog_stm_ps.test
 share/mysql/test/suite/binlog/t/binlog_stm_row.test
 share/mysql/test/suite/binlog/t/binlog_stm_tmp_table.test
 share/mysql/test/suite/binlog/t/binlog_stm_unsafe_default_expression_in_trigger.test
+share/mysql/test/suite/binlog/t/binlog_stm_unsafe_read_acl_tables_in_dml_ddl.test
 share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning-master.opt
 share/mysql/test/suite/binlog/t/binlog_stm_unsafe_warning.test
 share/mysql/test/suite/binlog/t/binlog_stm_user_variables.test
@@ -3443,6 +3803,7 @@ share/mysql/test/suite/binlog/t/binlog_temp_table_prevents_switch_session_binlog
 share/mysql/test/suite/binlog/t/binlog_temporary_tables_user_var_event.test
 share/mysql/test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start-master.opt
 share/mysql/test/suite/binlog/t/binlog_transaction_dependency_tracking_on_start.test
+share/mysql/test/suite/binlog/t/binlog_transaction_length.test
 share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_basic-master.opt
 share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_basic.test
 share/mysql/test/suite/binlog/t/binlog_transaction_write_set_savepoint_clear_identifiers-master.opt
@@ -3469,6 +3830,8 @@ 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_trx_split_across_binlog.test
+share/mysql/test/suite/binlog/t/compression_extra.test
+share/mysql/test/suite/binlog/t/compression_incident_event.test
 share/mysql/test/suite/binlog/t/print_identified_with_as_hex.test
 share/mysql/test/suite/binlog/t/show_binlog_events_no_lock.test
 share/mysql/test/suite/binlog_gtid/binlog_1slave_base.cnf
@@ -3480,6 +3843,7 @@ share/mysql/test/suite/binlog_gtid/r/binlog_group_commit_gtid_order.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_accessible_table_with_readonly.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_automatic_using_rolled_back.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_cache.result
+share/mysql/test/suite/binlog_gtid/r/binlog_gtid_compress_at_server_start.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_errors.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_exhausted.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_implicit_commit.result
@@ -3498,6 +3862,7 @@ share/mysql/test/suite/binlog_gtid/r/binlog_gtid_next_begin_caused_trx.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_next_partially_failed_grant.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_next_partially_failed_stmts.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_not_yet_determined_reacquire.result
+share/mysql/test/suite/binlog_gtid/r/binlog_gtid_purge_binlog_at_startup.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_rbr_only_flag.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_row_ctype_ucs.result
 share/mysql/test/suite/binlog_gtid/r/binlog_gtid_select_taking_write_locks.result
@@ -3538,6 +3903,7 @@ share/mysql/test/suite/binlog_gtid/t/binlog_gtid_accessible_table_with_readonly.
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_automatic_using_rolled_back.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_cache-master.opt
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_cache.test
+share/mysql/test/suite/binlog_gtid/t/binlog_gtid_compress_at_server_start.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_errors-master.opt
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_errors.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_exhausted-master.opt
@@ -3560,6 +3926,7 @@ share/mysql/test/suite/binlog_gtid/t/binlog_gtid_next_begin_caused_trx.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_next_partially_failed_grant.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_next_partially_failed_stmts.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_not_yet_determined_reacquire.test
+share/mysql/test/suite/binlog_gtid/t/binlog_gtid_purge_binlog_at_startup.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_rbr_only_flag.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_row_ctype_ucs.test
 share/mysql/test/suite/binlog_gtid/t/binlog_gtid_select_taking_write_locks.test
@@ -3649,6 +4016,7 @@ share/mysql/test/suite/binlog_nogtid/r/binlog_unsafe.result
 share/mysql/test/suite/binlog_nogtid/r/binlog_unsafe_stmt_capable_engine.result
 share/mysql/test/suite/binlog_nogtid/r/binlog_wait_for_executed_gtid_set_no_gtid.result
 share/mysql/test/suite/binlog_nogtid/r/binlog_xa_gtid_consistency_violation.result
+share/mysql/test/suite/binlog_nogtid/r/compression_non_trans.result
 share/mysql/test/suite/binlog_nogtid/std_data/bug11747887-bin.000003
 share/mysql/test/suite/binlog_nogtid/std_data/bug32407.001
 share/mysql/test/suite/binlog_nogtid/std_data/update-full-row.binlog
@@ -3737,15 +4105,16 @@ share/mysql/test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine-master.
 share/mysql/test/suite/binlog_nogtid/t/binlog_unsafe_stmt_capable_engine.test
 share/mysql/test/suite/binlog_nogtid/t/binlog_wait_for_executed_gtid_set_no_gtid.test
 share/mysql/test/suite/binlog_nogtid/t/binlog_xa_gtid_consistency_violation.test
+share/mysql/test/suite/binlog_nogtid/t/compression_non_trans.test
 share/mysql/test/suite/clone/include/clone_command.inc
 share/mysql/test/suite/clone/include/clone_command_send.inc
 share/mysql/test/suite/clone/include/clone_connection_begin.inc
 share/mysql/test/suite/clone/include/clone_connection_end.inc
+share/mysql/test/suite/clone/include/clone_upgrade.inc
 share/mysql/test/suite/clone/include/create_schema.inc
 share/mysql/test/suite/clone/include/ddl_lock_clone_wait.inc
 share/mysql/test/suite/clone/include/ddl_lock_ddl_wait.inc
 share/mysql/test/suite/clone/include/drop_schema.inc
-share/mysql/test/suite/clone/plugin.defs
 share/mysql/test/suite/clone/r/error_archival.result
 share/mysql/test/suite/clone/r/error_basic.result
 share/mysql/test/suite/clone/r/error_ddl.result
@@ -3757,6 +4126,7 @@ share/mysql/test/suite/clone/r/local_compress.result
 share/mysql/test/suite/clone/r/local_dml.result
 share/mysql/test/suite/clone/r/local_dml_auto_tune.result
 share/mysql/test/suite/clone/r/local_dml_compressed_row.result
+share/mysql/test/suite/clone/r/local_dml_no_redo.result
 share/mysql/test/suite/clone/r/local_encrypt.result
 share/mysql/test/suite/clone/r/local_features.result
 share/mysql/test/suite/clone/r/local_file_extend.result
@@ -3779,6 +4149,7 @@ share/mysql/test/suite/clone/r/remote_dml_recovery.result
 share/mysql/test/suite/clone/r/remote_dml_replace.result
 share/mysql/test/suite/clone/r/remote_dml_ssl.result
 share/mysql/test/suite/clone/r/remote_dml_ssl_certificate.result
+share/mysql/test/suite/clone/r/remote_dml_upgrade.result
 share/mysql/test/suite/clone/r/remote_encrypt.result
 share/mysql/test/suite/clone/r/remote_error_basic.result
 share/mysql/test/suite/clone/r/remote_error_ddl.result
@@ -3789,6 +4160,7 @@ share/mysql/test/suite/clone/r/remote_file_extend.result
 share/mysql/test/suite/clone/r/remote_insert.result
 share/mysql/test/suite/clone/r/remote_monitor_progress.result
 share/mysql/test/suite/clone/r/remote_restart.result
+share/mysql/test/suite/clone/r/remote_skip_validation.result
 share/mysql/test/suite/clone/r/remote_stage.result
 share/mysql/test/suite/clone/r/remote_stage_restart.result
 share/mysql/test/suite/clone/r/remote_stage_sys.result
@@ -3804,6 +4176,7 @@ share/mysql/test/suite/clone/t/local_compress.test
 share/mysql/test/suite/clone/t/local_dml.test
 share/mysql/test/suite/clone/t/local_dml_auto_tune.test
 share/mysql/test/suite/clone/t/local_dml_compressed_row.test
+share/mysql/test/suite/clone/t/local_dml_no_redo.test
 share/mysql/test/suite/clone/t/local_encrypt.test
 share/mysql/test/suite/clone/t/local_features.test
 share/mysql/test/suite/clone/t/local_file_extend.test
@@ -3832,6 +4205,8 @@ share/mysql/test/suite/clone/t/remote_dml_replace.cnf
 share/mysql/test/suite/clone/t/remote_dml_replace.test
 share/mysql/test/suite/clone/t/remote_dml_ssl.test
 share/mysql/test/suite/clone/t/remote_dml_ssl_certificate.test
+share/mysql/test/suite/clone/t/remote_dml_upgrade.cnf
+share/mysql/test/suite/clone/t/remote_dml_upgrade.test
 share/mysql/test/suite/clone/t/remote_encrypt.test
 share/mysql/test/suite/clone/t/remote_error_basic.test
 share/mysql/test/suite/clone/t/remote_error_ddl.test
@@ -3843,6 +4218,7 @@ share/mysql/test/suite/clone/t/remote_file_extend.test
 share/mysql/test/suite/clone/t/remote_insert.test
 share/mysql/test/suite/clone/t/remote_monitor_progress.test
 share/mysql/test/suite/clone/t/remote_restart.test
+share/mysql/test/suite/clone/t/remote_skip_validation.test
 share/mysql/test/suite/clone/t/remote_stage.test
 share/mysql/test/suite/clone/t/remote_stage_restart.test
 share/mysql/test/suite/clone/t/remote_stage_sys-master.opt
@@ -3850,6 +4226,7 @@ share/mysql/test/suite/clone/t/remote_stage_sys.test
 share/mysql/test/suite/clone/t/suite.opt
 share/mysql/test/suite/collations/README
 share/mysql/test/suite/collations/include/unicode.inc
+share/mysql/test/suite/collations/r/binary.result
 share/mysql/test/suite/collations/r/chinese.result
 share/mysql/test/suite/collations/r/classic_latin.result
 share/mysql/test/suite/collations/r/codepoint_order.result
@@ -3874,6 +4251,7 @@ share/mysql/test/suite/collations/r/spanish.result
 share/mysql/test/suite/collations/r/swedish.result
 share/mysql/test/suite/collations/r/turkish.result
 share/mysql/test/suite/collations/r/vietnamese.result
+share/mysql/test/suite/collations/t/binary.test
 share/mysql/test/suite/collations/t/chinese.test
 share/mysql/test/suite/collations/t/classic_latin.test
 share/mysql/test/suite/collations/t/codepoint_order.test
@@ -3898,6 +4276,141 @@ share/mysql/test/suite/collations/t/spanish.test
 share/mysql/test/suite/collations/t/swedish.test
 share/mysql/test/suite/collations/t/turkish.test
 share/mysql/test/suite/collations/t/vietnamese.test
+share/mysql/test/suite/component_keyring_file/inc/rpl_setup_component.inc
+share/mysql/test/suite/component_keyring_file/inc/rpl_teardown_component.inc
+share/mysql/test/suite/component_keyring_file/inc/setup_component.inc
+share/mysql/test/suite/component_keyring_file/inc/setup_component_customized.inc
+share/mysql/test/suite/component_keyring_file/inc/teardown_component.inc
+share/mysql/test/suite/component_keyring_file/inc/teardown_component_customized.inc
+share/mysql/test/suite/component_keyring_file/r/alter_rename_table.result
+share/mysql/test/suite/component_keyring_file/r/alter_table.result
+share/mysql/test/suite/component_keyring_file/r/clone_local_encrypt.result
+share/mysql/test/suite/component_keyring_file/r/clone_remote_encrypt.result
+share/mysql/test/suite/component_keyring_file/r/create_table.result
+share/mysql/test/suite/component_keyring_file/r/database.result
+share/mysql/test/suite/component_keyring_file/r/dd_upgrade_encrypted.result
+share/mysql/test/suite/component_keyring_file/r/encrypt_explicit.result
+share/mysql/test/suite/component_keyring_file/r/engine.result
+share/mysql/test/suite/component_keyring_file/r/import_compress_encrypt.result
+share/mysql/test/suite/component_keyring_file/r/keyring_component_status.result
+share/mysql/test/suite/component_keyring_file/r/keyring_encryption_test.result
+share/mysql/test/suite/component_keyring_file/r/load.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_1.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_2.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_3.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_4.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_5.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_6.result
+share/mysql/test/suite/component_keyring_file/r/log_encrypt_kill.result
+share/mysql/test/suite/component_keyring_file/r/migration.result
+share/mysql/test/suite/component_keyring_file/r/mysql_ts_alter_encrypt_1.result
+share/mysql/test/suite/component_keyring_file/r/mysql_ts_alter_encrypt_2.result
+share/mysql/test/suite/component_keyring_file/r/mysqldump.result
+share/mysql/test/suite/component_keyring_file/r/rename_table.result
+share/mysql/test/suite/component_keyring_file/r/rpl_binlog_cache_encryption.result
+share/mysql/test/suite/component_keyring_file/r/rpl_binlog_cache_temp_file_encryption.result
+share/mysql/test/suite/component_keyring_file/r/rpl_default_table_encryption.result
+share/mysql/test/suite/component_keyring_file/r/rpl_encryption.result
+share/mysql/test/suite/component_keyring_file/r/rpl_encryption_master_key_generation_recovery.result
+share/mysql/test/suite/component_keyring_file/r/rpl_encryption_master_key_rotation_at_startup.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_1.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_2.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_3.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_4.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_5.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_6.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_debug.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_fts.result
+share/mysql/test/suite/component_keyring_file/r/table_encrypt_kill.result
+share/mysql/test/suite/component_keyring_file/r/tablespace.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_1.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_10.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_11.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_2.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_3.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_4.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_5.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_6.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_7.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_8.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_encrypt_9.result
+share/mysql/test/suite/component_keyring_file/r/tablespace_with_tables.result
+share/mysql/test/suite/component_keyring_file/r/udf_test.result
+share/mysql/test/suite/component_keyring_file/r/undo_encrypt_basic.result
+share/mysql/test/suite/component_keyring_file/r/undo_encrypt_bootstrap.result
+share/mysql/test/suite/component_keyring_file/r/undo_encrypt_crash.result
+share/mysql/test/suite/component_keyring_file/r/undo_tablespace_encrypt.result
+share/mysql/test/suite/component_keyring_file/r/upgrade.result
+share/mysql/test/suite/component_keyring_file/t/alter_rename_table.test
+share/mysql/test/suite/component_keyring_file/t/alter_table.test
+share/mysql/test/suite/component_keyring_file/t/clone_local_encrypt-master.opt
+share/mysql/test/suite/component_keyring_file/t/clone_local_encrypt.test
+share/mysql/test/suite/component_keyring_file/t/clone_remote_encrypt-master.opt
+share/mysql/test/suite/component_keyring_file/t/clone_remote_encrypt.test
+share/mysql/test/suite/component_keyring_file/t/create_table.test
+share/mysql/test/suite/component_keyring_file/t/database.test
+share/mysql/test/suite/component_keyring_file/t/dd_upgrade_encrypted.test
+share/mysql/test/suite/component_keyring_file/t/encrypt_explicit.test
+share/mysql/test/suite/component_keyring_file/t/engine.test
+share/mysql/test/suite/component_keyring_file/t/import_compress_encrypt.test
+share/mysql/test/suite/component_keyring_file/t/keyring_component_status.test
+share/mysql/test/suite/component_keyring_file/t/keyring_encryption_test.test
+share/mysql/test/suite/component_keyring_file/t/load.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_1.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_2.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_3.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_4.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_5.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_6.test
+share/mysql/test/suite/component_keyring_file/t/log_encrypt_kill.test
+share/mysql/test/suite/component_keyring_file/t/migration-master.opt
+share/mysql/test/suite/component_keyring_file/t/migration.test
+share/mysql/test/suite/component_keyring_file/t/mysql_ts_alter_encrypt_1.test
+share/mysql/test/suite/component_keyring_file/t/mysql_ts_alter_encrypt_2.test
+share/mysql/test/suite/component_keyring_file/t/mysqldump.test
+share/mysql/test/suite/component_keyring_file/t/rename_table.test
+share/mysql/test/suite/component_keyring_file/t/rpl_binlog_cache_encryption.test
+share/mysql/test/suite/component_keyring_file/t/rpl_binlog_cache_temp_file_encryption.test
+share/mysql/test/suite/component_keyring_file/t/rpl_default_table_encryption.test
+share/mysql/test/suite/component_keyring_file/t/rpl_encryption.test
+share/mysql/test/suite/component_keyring_file/t/rpl_encryption_master_key_generation_recovery-master.opt
+share/mysql/test/suite/component_keyring_file/t/rpl_encryption_master_key_generation_recovery.test
+share/mysql/test/suite/component_keyring_file/t/rpl_encryption_master_key_rotation_at_startup-master.opt
+share/mysql/test/suite/component_keyring_file/t/rpl_encryption_master_key_rotation_at_startup.test
+share/mysql/test/suite/component_keyring_file/t/suite.opt
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_1.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_2.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_3.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_4.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_5.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_6.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_debug.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_fts.test
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_kill-master.opt
+share/mysql/test/suite/component_keyring_file/t/table_encrypt_kill.test
+share/mysql/test/suite/component_keyring_file/t/tablespace.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_1-master.opt
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_1.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_10.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_11.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_2-master.opt
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_2.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_3.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_4.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_5-master.opt
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_5.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_6.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_7.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_8.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_encrypt_9.test
+share/mysql/test/suite/component_keyring_file/t/tablespace_with_tables.test
+share/mysql/test/suite/component_keyring_file/t/udf_test-master.opt
+share/mysql/test/suite/component_keyring_file/t/udf_test.test
+share/mysql/test/suite/component_keyring_file/t/undo_encrypt_basic.test
+share/mysql/test/suite/component_keyring_file/t/undo_encrypt_bootstrap.test
+share/mysql/test/suite/component_keyring_file/t/undo_encrypt_crash.test
+share/mysql/test/suite/component_keyring_file/t/undo_tablespace_encrypt.test
+share/mysql/test/suite/component_keyring_file/t/upgrade.test
 share/mysql/test/suite/connection_control/inc/check_connection_delay.inc
 share/mysql/test/suite/connection_control/inc/cleanup_proxy_accounts.inc
 share/mysql/test/suite/connection_control/inc/have_connection_control_plugin.inc
@@ -4718,6 +5231,7 @@ share/mysql/test/suite/funcs_1/datadict/datadict_bug_12777.inc
 share/mysql/test/suite/funcs_1/datadict/datadict_load.inc
 share/mysql/test/suite/funcs_1/datadict/datadict_priv.inc
 share/mysql/test/suite/funcs_1/datadict/is_schemata.inc
+share/mysql/test/suite/funcs_1/datadict/is_schemata_extensions.inc
 share/mysql/test/suite/funcs_1/datadict/is_table_query.inc
 share/mysql/test/suite/funcs_1/datadict/is_tables.inc
 share/mysql/test/suite/funcs_1/datadict/is_triggers.inc
@@ -4799,6 +5313,7 @@ share/mysql/test/suite/funcs_1/r/is_engines_merge.result
 share/mysql/test/suite/funcs_1/r/is_engines_myisam.result
 share/mysql/test/suite/funcs_1/r/is_events.result
 share/mysql/test/suite/funcs_1/r/is_events_ci.result
+share/mysql/test/suite/funcs_1/r/is_extensions.result
 share/mysql/test/suite/funcs_1/r/is_key_column_usage.result
 share/mysql/test/suite/funcs_1/r/is_key_column_usage_ci.result
 share/mysql/test/suite/funcs_1/r/is_routines.result
@@ -4807,6 +5322,9 @@ share/mysql/test/suite/funcs_1/r/is_schema_privileges.result
 share/mysql/test/suite/funcs_1/r/is_schema_privileges_is_mysql_test.result
 share/mysql/test/suite/funcs_1/r/is_schemata.result
 share/mysql/test/suite/funcs_1/r/is_schemata_ci.result
+share/mysql/test/suite/funcs_1/r/is_schemata_extensions.result
+share/mysql/test/suite/funcs_1/r/is_schemata_extensions_ci.result
+share/mysql/test/suite/funcs_1/r/is_schemata_extensions_is_mysql_test.result
 share/mysql/test/suite/funcs_1/r/is_schemata_is_mysql_test.result
 share/mysql/test/suite/funcs_1/r/is_statistics_ci.result
 share/mysql/test/suite/funcs_1/r/is_statistics_cs.result
@@ -4927,6 +5445,7 @@ share/mysql/test/suite/funcs_1/t/is_engines_merge.test
 share/mysql/test/suite/funcs_1/t/is_engines_myisam.test
 share/mysql/test/suite/funcs_1/t/is_events.test
 share/mysql/test/suite/funcs_1/t/is_events_ci.test
+share/mysql/test/suite/funcs_1/t/is_extensions.test
 share/mysql/test/suite/funcs_1/t/is_key_column_usage.test
 share/mysql/test/suite/funcs_1/t/is_key_column_usage_ci.test
 share/mysql/test/suite/funcs_1/t/is_routines.test
@@ -4935,6 +5454,9 @@ share/mysql/test/suite/funcs_1/t/is_schema_privileges.test
 share/mysql/test/suite/funcs_1/t/is_schema_privileges_is_mysql_test.test
 share/mysql/test/suite/funcs_1/t/is_schemata.test
 share/mysql/test/suite/funcs_1/t/is_schemata_ci.test
+share/mysql/test/suite/funcs_1/t/is_schemata_extensions.test
+share/mysql/test/suite/funcs_1/t/is_schemata_extensions_ci.test
+share/mysql/test/suite/funcs_1/t/is_schemata_extensions_is_mysql_test.test
 share/mysql/test/suite/funcs_1/t/is_schemata_is_mysql_test.test
 share/mysql/test/suite/funcs_1/t/is_statistics_ci.test
 share/mysql/test/suite/funcs_1/t/is_statistics_cs.test
@@ -5067,6 +5589,7 @@ share/mysql/test/suite/gcol/r/gcol_handler_innodb.result
 share/mysql/test/suite/gcol/r/gcol_handler_myisam.result
 share/mysql/test/suite/gcol/r/gcol_ins_upd_innodb.result
 share/mysql/test/suite/gcol/r/gcol_ins_upd_myisam.result
+share/mysql/test/suite/gcol/r/gcol_insert_ignore.result
 share/mysql/test/suite/gcol/r/gcol_keys_innodb.result
 share/mysql/test/suite/gcol/r/gcol_keys_myisam.result
 share/mysql/test/suite/gcol/r/gcol_memory.result
@@ -5100,6 +5623,7 @@ share/mysql/test/suite/gcol/t/gcol_handler_innodb.test
 share/mysql/test/suite/gcol/t/gcol_handler_myisam.test
 share/mysql/test/suite/gcol/t/gcol_ins_upd_innodb.test
 share/mysql/test/suite/gcol/t/gcol_ins_upd_myisam.test
+share/mysql/test/suite/gcol/t/gcol_insert_ignore.test
 share/mysql/test/suite/gcol/t/gcol_keys_innodb.test
 share/mysql/test/suite/gcol/t/gcol_keys_myisam.test
 share/mysql/test/suite/gcol/t/gcol_memory.test
@@ -5152,6 +5676,14 @@ share/mysql/test/suite/gcol_ndb/t/gcol_supported_sql_funcs_ndb.test
 share/mysql/test/suite/gcol_ndb/t/gcol_trigger_sp_ndb.test
 share/mysql/test/suite/gcol_ndb/t/gcol_view_ndb.test
 share/mysql/test/suite/gis/r/all_geometry_types_instantiable.result
+share/mysql/test/suite/gis/r/cast_as_geometry.result
+share/mysql/test/suite/gis/r/cast_as_geometrycollection.result
+share/mysql/test/suite/gis/r/cast_as_linestring.result
+share/mysql/test/suite/gis/r/cast_as_multilinestring.result
+share/mysql/test/suite/gis/r/cast_as_multipoint.result
+share/mysql/test/suite/gis/r/cast_as_multipolygon.result
+share/mysql/test/suite/gis/r/cast_as_point.result
+share/mysql/test/suite/gis/r/cast_as_polygon.result
 share/mysql/test/suite/gis/r/ddl.result
 share/mysql/test/suite/gis/r/geohash_functions.result
 share/mysql/test/suite/gis/r/geojson_functions.result
@@ -5192,7 +5724,12 @@ share/mysql/test/suite/gis/r/spatial_utility_function_swapxy.result
 share/mysql/test/suite/gis/r/spatial_utility_function_validate.result
 share/mysql/test/suite/gis/r/spatial_utility_functions_xy.result
 share/mysql/test/suite/gis/r/srs.result
+share/mysql/test/suite/gis/r/st_collect.result
+share/mysql/test/suite/gis/r/st_frechet_distance.result
+share/mysql/test/suite/gis/r/st_hausdorff_distance.result
 share/mysql/test/suite/gis/r/st_latitude.result
+share/mysql/test/suite/gis/r/st_line_interpolate.result
+share/mysql/test/suite/gis/r/st_lineinterpolate.result
 share/mysql/test/suite/gis/r/st_longitude.result
 share/mysql/test/suite/gis/r/st_transform.result
 share/mysql/test/suite/gis/r/st_x.result
@@ -5202,6 +5739,14 @@ share/mysql/test/suite/gis/r/wkb_geometry_representation.result
 share/mysql/test/suite/gis/r/wkt.result
 share/mysql/test/suite/gis/r/wkt_geometry_representation.result
 share/mysql/test/suite/gis/t/all_geometry_types_instantiable.test
+share/mysql/test/suite/gis/t/cast_as_geometry.test
+share/mysql/test/suite/gis/t/cast_as_geometrycollection.test
+share/mysql/test/suite/gis/t/cast_as_linestring.test
+share/mysql/test/suite/gis/t/cast_as_multilinestring.test
+share/mysql/test/suite/gis/t/cast_as_multipoint.test
+share/mysql/test/suite/gis/t/cast_as_multipolygon.test
+share/mysql/test/suite/gis/t/cast_as_point.test
+share/mysql/test/suite/gis/t/cast_as_polygon.test
 share/mysql/test/suite/gis/t/ddl.test
 share/mysql/test/suite/gis/t/geohash_functions.test
 share/mysql/test/suite/gis/t/geojson_functions.test
@@ -5242,7 +5787,12 @@ share/mysql/test/suite/gis/t/spatial_utility_function_swapxy.test
 share/mysql/test/suite/gis/t/spatial_utility_function_validate.test
 share/mysql/test/suite/gis/t/spatial_utility_functions_xy.test
 share/mysql/test/suite/gis/t/srs.test
+share/mysql/test/suite/gis/t/st_collect.test
+share/mysql/test/suite/gis/t/st_frechet_distance.test
+share/mysql/test/suite/gis/t/st_hausdorff_distance.test
 share/mysql/test/suite/gis/t/st_latitude.test
+share/mysql/test/suite/gis/t/st_line_interpolate.test
+share/mysql/test/suite/gis/t/st_lineinterpolate.test
 share/mysql/test/suite/gis/t/st_longitude.test
 share/mysql/test/suite/gis/t/st_transform.test
 share/mysql/test/suite/gis/t/st_x.test
@@ -5262,13 +5812,41 @@ share/mysql/test/suite/group_replication/include/gr_primary_auto_failover_vs_con
 share/mysql/test/suite/group_replication/include/gr_primary_manual_failover_vs_consistent_reads.inc
 share/mysql/test/suite/group_replication/include/gr_recovery_channel_block.inc
 share/mysql/test/suite/group_replication/include/gr_recovery_channel_resume.inc
+share/mysql/test/suite/group_replication/include/gr_replicate_anonymous_server_to_group.inc
+share/mysql/test/suite/group_replication/include/gr_replicate_anonymous_server_to_group_error_cases.inc
 share/mysql/test/suite/group_replication/include/gr_single_primary_with_transaction_isolation.inc
 share/mysql/test/suite/group_replication/include/gr_startup_check_node_seed_skips_own_address.inc
 share/mysql/test/suite/group_replication/my.cnf
 share/mysql/test/suite/group_replication/r/gr_DML_error.result
 share/mysql/test/suite/group_replication/r/gr_abort_query_on_plugin_error.result
 share/mysql/test/suite/group_replication/r/gr_abort_query_on_plugin_recovery.result
+share/mysql/test/suite/group_replication/r/gr_acf_2groups_failover.result
+share/mysql/test/suite/group_replication/r/gr_acf_57_sources.result
+share/mysql/test/suite/group_replication/r/gr_acf_basic.result
+share/mysql/test/suite/group_replication/r/gr_acf_connect_to_member_recovering.result
+share/mysql/test/suite/group_replication/r/gr_acf_disable_failover.result
+share/mysql/test/suite/group_replication/r/gr_acf_enable_failover.result
+share/mysql/test/suite/group_replication/r/gr_acf_error_state_handling.result
+share/mysql/test/suite/group_replication/r/gr_acf_group_member_maintenance.result
+share/mysql/test/suite/group_replication/r/gr_acf_join_unreachable_member.result
+share/mysql/test/suite/group_replication/r/gr_acf_master_retry.result
+share/mysql/test/suite/group_replication/r/gr_acf_membership_updates_2groups.result
+share/mysql/test/suite/group_replication/r/gr_acf_monitor_io_stopping.result
+share/mysql/test/suite/group_replication/r/gr_acf_msr_2groups_failover.result
+share/mysql/test/suite/group_replication/r/gr_acf_not_change_if_recovering.result
+share/mysql/test/suite/group_replication/r/gr_acf_ps_query_fail.result
+share/mysql/test/suite/group_replication/r/gr_acf_receiver_group.result
+share/mysql/test/suite/group_replication/r/gr_acf_role_changes_weight.result
+share/mysql/test/suite/group_replication/r/gr_acf_secondary.result
+share/mysql/test/suite/group_replication/r/gr_acf_sender_change_group.result
+share/mysql/test/suite/group_replication/r/gr_acf_sender_no_majority.result
+share/mysql/test/suite/group_replication/r/gr_acf_sender_no_majority_2groups.result
+share/mysql/test/suite/group_replication/r/gr_acf_sender_no_majority_connection.result
+share/mysql/test/suite/group_replication/r/gr_acf_source_unmanaged_and_group_member.result
+share/mysql/test/suite/group_replication/r/gr_acf_switch_highest_weight_auto.result
+share/mysql/test/suite/group_replication/r/gr_acf_valid_sender_status.result
 share/mysql/test/suite/group_replication/r/gr_addmember_during_dml.result
+share/mysql/test/suite/group_replication/r/gr_addmember_error_message.result
 share/mysql/test/suite/group_replication/r/gr_addmember_insert_on_donor.result
 share/mysql/test/suite/group_replication/r/gr_addmember_insert_on_nondonor.result
 share/mysql/test/suite/group_replication/r/gr_applier_channel_reset.result
@@ -5300,9 +5878,13 @@ share/mysql/test/suite/group_replication/r/gr_autorejoin_option.result
 share/mysql/test/suite/group_replication/r/gr_autorejoin_rejoin_after_switch_mpm2spm.result
 share/mysql/test/suite/group_replication/r/gr_autorejoin_spm.result
 share/mysql/test/suite/group_replication/r/gr_autorejoin_stop_gr.result
+share/mysql/test/suite/group_replication/r/gr_autorejoin_while_applier_locked.result
+share/mysql/test/suite/group_replication/r/gr_autorejoin_while_recovery_locked.result
+share/mysql/test/suite/group_replication/r/gr_autorejoin_with_clone_while_recovery_locked.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_checksum_failure.result
+share/mysql/test/suite/group_replication/r/gr_binlog_checksum.result
+share/mysql/test/suite/group_replication/r/gr_binlog_checksum_mixed.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_blocked_start_gr_killed.result
@@ -5310,10 +5892,12 @@ share/mysql/test/suite/group_replication/r/gr_blocked_view_change_invalid_arg.re
 share/mysql/test/suite/group_replication/r/gr_capture.result
 share/mysql/test/suite/group_replication/r/gr_certifier_garbage_collection.result
 share/mysql/test/suite/group_replication/r/gr_certifier_garbage_collection2.result
+share/mysql/test/suite/group_replication/r/gr_certifier_garbage_collection_with_clone.result
 share/mysql/test/suite/group_replication/r/gr_certifier_message_same_member.result
 share/mysql/test/suite/group_replication/r/gr_change_master_hidden.result
 share/mysql/test/suite/group_replication/r/gr_change_master_hidden_ps_protocol.result
 share/mysql/test/suite/group_replication/r/gr_change_master_not_replicated.result
+share/mysql/test/suite/group_replication/r/gr_channels_require_table_primary_key_check.result
 share/mysql/test/suite/group_replication/r/gr_check_count_tx_remote_applier_queue.result
 share/mysql/test/suite/group_replication/r/gr_check_stage_values_correctness.result
 share/mysql/test/suite/group_replication/r/gr_clone_applier_reset.result
@@ -5323,8 +5907,11 @@ share/mysql/test/suite/group_replication/r/gr_clone_integration_basics_with_ssl.
 share/mysql/test/suite/group_replication/r/gr_clone_integration_clone_not_installed.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_clone_on_rejoin.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_clone_on_server_start.result
+share/mysql/test/suite/group_replication/r/gr_clone_integration_clone_operations_on_runnning_member.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_concurrent_shutdown.result
+share/mysql/test/suite/group_replication/r/gr_clone_integration_ddl_error.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_different_recovery_user.result
+share/mysql/test/suite/group_replication/r/gr_clone_integration_error_fallback.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_exit_state_action_on_clone_error.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_exit_state_action_on_clone_error_offline.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_kill_donor_during_clone.result
@@ -5341,6 +5928,7 @@ share/mysql/test/suite/group_replication/r/gr_clone_integration_stop_donor_durin
 share/mysql/test/suite/group_replication/r/gr_clone_integration_stop_joiner_during_clone.result
 share/mysql/test/suite/group_replication/r/gr_clone_integration_stop_primary_member.result
 share/mysql/test/suite/group_replication/r/gr_clone_threshold_basic.result
+share/mysql/test/suite/group_replication/r/gr_clone_with_consistency_after.result
 share/mysql/test/suite/group_replication/r/gr_collations_key_conflict.result
 share/mysql/test/suite/group_replication/r/gr_columns_partition_tables.result
 share/mysql/test/suite/group_replication/r/gr_command_line_recovery_ssl_validation.result
@@ -5372,6 +5960,10 @@ share/mysql/test/suite/group_replication/r/gr_consistent_reads_after_vs_eventual
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_after_xa.result
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_before.result
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_and_after.result
+share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_and_after_mode_switch_to_multi.result
+share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_and_after_mode_switch_to_single.result
+share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_and_after_on_primary_election.result
+share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_and_after_on_primary_switch.result
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_parallel_stop.result
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_before_switch_group_mode.result
 share/mysql/test/suite/group_replication/r/gr_consistent_reads_lower_version.result
@@ -5389,6 +5981,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_create_table_as_select.result
 share/mysql/test/suite/group_replication/r/gr_cross_version_compatiblity_change_during_recovery.result
 share/mysql/test/suite/group_replication/r/gr_cross_version_lower_version_recovery_donor.result
 share/mysql/test/suite/group_replication/r/gr_cross_version_member_join.result
@@ -5473,9 +6066,13 @@ share/mysql/test/suite/group_replication/r/gr_incorrect_group_name_join.result
 share/mysql/test/suite/group_replication/r/gr_inject_join_error.result
 share/mysql/test/suite/group_replication/r/gr_inject_pipeline_error_local_gtid.result
 share/mysql/test/suite/group_replication/r/gr_inject_pipeline_error_remote_gtid.result
+share/mysql/test/suite/group_replication/r/gr_innodb_doublewrite_dir.result
+share/mysql/test/suite/group_replication/r/gr_innodb_unknown_dir.result
 share/mysql/test/suite/group_replication/r/gr_install_and_reboot_are_safe.result
 share/mysql/test/suite/group_replication/r/gr_invoked_features.result
-share/mysql/test/suite/group_replication/r/gr_ip_whitelist_options.result
+share/mysql/test/suite/group_replication/r/gr_ip_allowlist_options.result
+share/mysql/test/suite/group_replication/r/gr_ip_allowlist_precedence.result
+share/mysql/test/suite/group_replication/r/gr_ip_whitelist_deprecation.result
 share/mysql/test/suite/group_replication/r/gr_join_with_suspect_member.result
 share/mysql/test/suite/group_replication/r/gr_json_array_unique_key_conflict.result
 share/mysql/test/suite/group_replication/r/gr_key_rotation.result
@@ -5502,6 +6099,7 @@ share/mysql/test/suite/group_replication/r/gr_member_expel_during_shutdown.resul
 share/mysql/test/suite/group_replication/r/gr_member_expel_options.result
 share/mysql/test/suite/group_replication/r/gr_member_host_port.result
 share/mysql/test/suite/group_replication/r/gr_member_lengthy_hostname.result
+share/mysql/test/suite/group_replication/r/gr_message_cache_size_min.result
 share/mysql/test/suite/group_replication/r/gr_message_cache_size_options.result
 share/mysql/test/suite/group_replication/r/gr_message_cache_size_options_32bit.result
 share/mysql/test/suite/group_replication/r/gr_message_service.result
@@ -5520,6 +6118,7 @@ share/mysql/test/suite/group_replication/r/gr_multi_primary_unique_key_conflict.
 share/mysql/test/suite/group_replication/r/gr_multi_unique_key_conflict.result
 share/mysql/test/suite/group_replication/r/gr_multiple_groups_in_group_seeds.result
 share/mysql/test/suite/group_replication/r/gr_multiple_groups_with_same_name.result
+share/mysql/test/suite/group_replication/r/gr_multiple_starts_after_clone.result
 share/mysql/test/suite/group_replication/r/gr_multiple_trigger.result
 share/mysql/test/suite/group_replication/r/gr_multiple_version_members.result
 share/mysql/test/suite/group_replication/r/gr_negative_certification.result
@@ -5527,6 +6126,7 @@ share/mysql/test/suite/group_replication/r/gr_network_partition_handling.result
 share/mysql/test/suite/group_replication/r/gr_network_partition_handling_after_restore.result
 share/mysql/test/suite/group_replication/r/gr_no_user_start_failure.result
 share/mysql/test/suite/group_replication/r/gr_notifications_join_leave.result
+share/mysql/test/suite/group_replication/r/gr_notifications_mode_change.result
 share/mysql/test/suite/group_replication/r/gr_notifications_quorum.result
 share/mysql/test/suite/group_replication/r/gr_notifications_single_primary.result
 share/mysql/test/suite/group_replication/r/gr_nullable_unique_key_conflict.result
@@ -5536,6 +6136,8 @@ share/mysql/test/suite/group_replication/r/gr_parallel_applier_indexes_commit_or
 share/mysql/test/suite/group_replication/r/gr_parallel_applier_sequential_indexes.result
 share/mysql/test/suite/group_replication/r/gr_parallel_insert.result
 share/mysql/test/suite/group_replication/r/gr_parallel_inserts_same_server.result
+share/mysql/test/suite/group_replication/r/gr_parallel_start_stop.result
+share/mysql/test/suite/group_replication/r/gr_parallel_start_uninstall.result
 share/mysql/test/suite/group_replication/r/gr_parallel_stop_dml.result
 share/mysql/test/suite/group_replication/r/gr_parallel_update.result
 share/mysql/test/suite/group_replication/r/gr_parallel_update_same_server.result
@@ -5544,6 +6146,7 @@ share/mysql/test/suite/group_replication/r/gr_perfschema.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_connect_status.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_group_member_stats.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_group_member_stats_additional_columns.result
+share/mysql/test/suite/group_replication/r/gr_perfschema_group_member_stats_bad_alloc.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_group_members.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_group_members_additional_columns.result
 share/mysql/test/suite/group_replication/r/gr_perfschema_group_members_number.result
@@ -5572,6 +6175,7 @@ share/mysql/test/suite/group_replication/r/gr_primary_failover_consistency_wait_
 share/mysql/test/suite/group_replication/r/gr_primary_failover_consistency_when_on_multi_primary.result
 share/mysql/test/suite/group_replication/r/gr_primary_key_conflict.result
 share/mysql/test/suite/group_replication/r/gr_primary_key_conflict_xa.result
+share/mysql/test/suite/group_replication/r/gr_primary_key_on_invisible_column_conflict.result
 share/mysql/test/suite/group_replication/r/gr_primary_key_unique_conflict.result
 share/mysql/test/suite/group_replication/r/gr_primary_manual_failover_vs_consistent_reads_after.result
 share/mysql/test/suite/group_replication/r/gr_primary_manual_failover_vs_consistent_reads_before.result
@@ -5666,6 +6270,7 @@ share/mysql/test/suite/group_replication/r/gr_recovery.result
 share/mysql/test/suite/group_replication/r/gr_recovery_change_master.result
 share/mysql/test/suite/group_replication/r/gr_recovery_channel.result
 share/mysql/test/suite/group_replication/r/gr_recovery_channel_compression.result
+share/mysql/test/suite/group_replication/r/gr_recovery_clone_activation_threshold.result
 share/mysql/test/suite/group_replication/r/gr_recovery_completion_mode.result
 share/mysql/test/suite/group_replication/r/gr_recovery_completion_mode_failure.result
 share/mysql/test/suite/group_replication/r/gr_recovery_completion_mode_live_switch.result
@@ -5677,6 +6282,14 @@ share/mysql/test/suite/group_replication/r/gr_recovery_donor_failover.result
 share/mysql/test/suite/group_replication/r/gr_recovery_donor_public_key.result
 share/mysql/test/suite/group_replication/r/gr_recovery_donor_retry.result
 share/mysql/test/suite/group_replication/r/gr_recovery_double_view_update.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_invalid_conf.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_invalid_donor.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_ipv6_ipv4.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_clone.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_iterate_list_incremental.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_multiple_valid.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_no_fallback.result
+share/mysql/test/suite/group_replication/r/gr_recovery_endpoints_retry_clone.result
 share/mysql/test/suite/group_replication/r/gr_recovery_errors_report.result
 share/mysql/test/suite/group_replication/r/gr_recovery_fails_to_detect_thread_stop.result
 share/mysql/test/suite/group_replication/r/gr_recovery_lower_max_retry_count.result
@@ -5706,8 +6319,12 @@ share/mysql/test/suite/group_replication/r/gr_repeatable_read_isolation.result
 share/mysql/test/suite/group_replication/r/gr_replicate_group_to_group.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_local_anonymous_server_to_group.result
+share/mysql/test/suite/group_replication/r/gr_replicate_local_anonymous_server_to_group_error_cases.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_replicate_uuid_anonymous_server_to_group.result
+share/mysql/test/suite/group_replication/r/gr_replicate_uuid_anonymous_server_to_group_error_cases.result
 share/mysql/test/suite/group_replication/r/gr_replication_timestamps.result
 share/mysql/test/suite/group_replication/r/gr_reset_master.result
 share/mysql/test/suite/group_replication/r/gr_reset_master_before_provisioning.result
@@ -5786,7 +6403,10 @@ share/mysql/test/suite/group_replication/r/gr_ssl.result
 share/mysql/test/suite/group_replication/r/gr_ssl_fips_mode.result
 share/mysql/test/suite/group_replication/r/gr_ssl_mode.result
 share/mysql/test/suite/group_replication/r/gr_ssl_mode_basic.result
+share/mysql/test/suite/group_replication/r/gr_ssl_mode_tls_source_incompatible_certificates.result
+share/mysql/test/suite/group_replication/r/gr_ssl_mode_tls_source_mysql_admin.result
 share/mysql/test/suite/group_replication/r/gr_ssl_mode_verify_identity_error.result
+share/mysql/test/suite/group_replication/r/gr_ssl_on_admin_interface.result
 share/mysql/test/suite/group_replication/r/gr_ssl_options.result
 share/mysql/test/suite/group_replication/r/gr_ssl_options2.result
 share/mysql/test/suite/group_replication/r/gr_ssl_tls13.result
@@ -5795,6 +6415,10 @@ share/mysql/test/suite/group_replication/r/gr_ssl_tls13_runtime_valid_configurat
 share/mysql/test/suite/group_replication/r/gr_stable_set_on_view_change.result
 share/mysql/test/suite/group_replication/r/gr_start_during_start.result
 share/mysql/test/suite/group_replication/r/gr_start_fail_restore_read_mode.result
+share/mysql/test/suite/group_replication/r/gr_start_gr_credential_options_clone.result
+share/mysql/test/suite/group_replication/r/gr_start_gr_with_credentials.result
+share/mysql/test/suite/group_replication/r/gr_start_gr_with_credentials_2.result
+share/mysql/test/suite/group_replication/r/gr_start_gr_with_credentials_3.result
 share/mysql/test/suite/group_replication/r/gr_start_group_without_boot_node.result
 share/mysql/test/suite/group_replication/r/gr_start_on_boot.result
 share/mysql/test/suite/group_replication/r/gr_start_on_boot_with_invalid_group_name.result
@@ -5820,6 +6444,7 @@ share/mysql/test/suite/group_replication/r/gr_startup_verifications_not_gtid.res
 share/mysql/test/suite/group_replication/r/gr_startup_verifications_not_log_slave_updates.result
 share/mysql/test/suite/group_replication/r/gr_startup_verifications_not_table_repositories.result
 share/mysql/test/suite/group_replication/r/gr_stop_async_on_stop_gr.result
+share/mysql/test/suite/group_replication/r/gr_stop_during_pfs.result
 share/mysql/test/suite/group_replication/r/gr_stop_during_start.result
 share/mysql/test/suite/group_replication/r/gr_stop_gr_and_modify_wc_during_dml.result
 share/mysql/test/suite/group_replication/r/gr_stop_gr_during_dml_01.result
@@ -5828,6 +6453,7 @@ share/mysql/test/suite/group_replication/r/gr_stop_gr_kills_binlog_dump.result
 share/mysql/test/suite/group_replication/r/gr_stop_procedure_hang.result
 share/mysql/test/suite/group_replication/r/gr_stop_wait_udf_finish.result
 share/mysql/test/suite/group_replication/r/gr_stop_when_unreachable.result
+share/mysql/test/suite/group_replication/r/gr_stop_while_recovery_locked.result
 share/mysql/test/suite/group_replication/r/gr_stop_with_gtid_gaps.result
 share/mysql/test/suite/group_replication/r/gr_stop_with_gtid_gaps_applier.result
 share/mysql/test/suite/group_replication/r/gr_storage_engines.result
@@ -5862,6 +6488,7 @@ share/mysql/test/suite/group_replication/r/gr_view_change_order.result
 share/mysql/test/suite/group_replication/r/gr_view_changes.result
 share/mysql/test/suite/group_replication/r/gr_wait_for_executed_gtid_set_no_timeout.result
 share/mysql/test/suite/group_replication/r/gr_wait_for_executed_gtid_set_with_sleep.result
+share/mysql/test/suite/group_replication/r/gr_with_credential_and_channel.result
 share/mysql/test/suite/group_replication/r/gr_without_perfschema.result
 share/mysql/test/suite/group_replication/r/gr_write_concurrency.result
 share/mysql/test/suite/group_replication/r/gr_write_concurrency_privilege.result
@@ -5875,8 +6502,60 @@ share/mysql/test/suite/group_replication/t/gr_000400_000500_incompatible-master.
 share/mysql/test/suite/group_replication/t/gr_DML_error.test
 share/mysql/test/suite/group_replication/t/gr_abort_query_on_plugin_error.test
 share/mysql/test/suite/group_replication/t/gr_abort_query_on_plugin_recovery.test
+share/mysql/test/suite/group_replication/t/gr_acf_2groups_failover.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_2groups_failover.test
+share/mysql/test/suite/group_replication/t/gr_acf_57_sources.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_57_sources.test
+share/mysql/test/suite/group_replication/t/gr_acf_basic.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_basic.test
+share/mysql/test/suite/group_replication/t/gr_acf_connect_to_member_recovering.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_connect_to_member_recovering.test
+share/mysql/test/suite/group_replication/t/gr_acf_disable_failover.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_disable_failover.test
+share/mysql/test/suite/group_replication/t/gr_acf_enable_failover.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_enable_failover.test
+share/mysql/test/suite/group_replication/t/gr_acf_error_state_handling.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_error_state_handling.test
+share/mysql/test/suite/group_replication/t/gr_acf_group_member_maintenance.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_group_member_maintenance.test
+share/mysql/test/suite/group_replication/t/gr_acf_join_unreachable_member.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_join_unreachable_member.test
+share/mysql/test/suite/group_replication/t/gr_acf_master_retry.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_master_retry.test
+share/mysql/test/suite/group_replication/t/gr_acf_membership_updates_2groups.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_membership_updates_2groups.test
+share/mysql/test/suite/group_replication/t/gr_acf_monitor_io_stopping.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_monitor_io_stopping.test
+share/mysql/test/suite/group_replication/t/gr_acf_msr_2groups_failover.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_msr_2groups_failover.test
+share/mysql/test/suite/group_replication/t/gr_acf_not_change_if_recovering.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_not_change_if_recovering.test
+share/mysql/test/suite/group_replication/t/gr_acf_ps_query_fail.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_ps_query_fail.test
+share/mysql/test/suite/group_replication/t/gr_acf_receiver_group.test
+share/mysql/test/suite/group_replication/t/gr_acf_role_changes_weight.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_role_changes_weight.test
+share/mysql/test/suite/group_replication/t/gr_acf_secondary.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_secondary.test
+share/mysql/test/suite/group_replication/t/gr_acf_sender_change_group.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_sender_change_group.test
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority.test
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority_2groups.test
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority_connection.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_sender_no_majority_connection.test
+share/mysql/test/suite/group_replication/t/gr_acf_source_unmanaged_and_group_member.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_source_unmanaged_and_group_member.test
+share/mysql/test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_switch_highest_weight_auto.test
+share/mysql/test/suite/group_replication/t/gr_acf_valid_sender_status.cnf
+share/mysql/test/suite/group_replication/t/gr_acf_valid_sender_status.test
 share/mysql/test/suite/group_replication/t/gr_addmember_during_dml.cnf
 share/mysql/test/suite/group_replication/t/gr_addmember_during_dml.test
+share/mysql/test/suite/group_replication/t/gr_addmember_error_message-master.opt
+share/mysql/test/suite/group_replication/t/gr_addmember_error_message-slave.opt
+share/mysql/test/suite/group_replication/t/gr_addmember_error_message.test
 share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_donor.cnf
 share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_donor.test
 share/mysql/test/suite/group_replication/t/gr_addmember_insert_on_nondonor.cnf
@@ -5929,12 +6608,21 @@ share/mysql/test/suite/group_replication/t/gr_autorejoin_spm.cnf
 share/mysql/test/suite/group_replication/t/gr_autorejoin_spm.test
 share/mysql/test/suite/group_replication/t/gr_autorejoin_stop_gr.cnf
 share/mysql/test/suite/group_replication/t/gr_autorejoin_stop_gr.test
+share/mysql/test/suite/group_replication/t/gr_autorejoin_while_applier_locked.cnf
+share/mysql/test/suite/group_replication/t/gr_autorejoin_while_applier_locked.test
+share/mysql/test/suite/group_replication/t/gr_autorejoin_while_recovery_locked.cnf
+share/mysql/test/suite/group_replication/t/gr_autorejoin_while_recovery_locked.test
+share/mysql/test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked-master.opt
+share/mysql/test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked-slave.opt
+share/mysql/test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.cnf
+share/mysql/test/suite/group_replication/t/gr_autorejoin_with_clone_while_recovery_locked.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_basic_ipv6.cnf
-share/mysql/test/suite/group_replication/t/gr_binlog_checksum_failure.test
+share/mysql/test/suite/group_replication/t/gr_binlog_checksum.test
+share/mysql/test/suite/group_replication/t/gr_binlog_checksum_mixed.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
@@ -5944,13 +6632,17 @@ share/mysql/test/suite/group_replication/t/gr_blocked_view_change_invalid_arg.te
 share/mysql/test/suite/group_replication/t/gr_capture.test
 share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection.test
 share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection2.test
+share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone-master.opt
+share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone-slave.opt
+share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.cnf
+share/mysql/test/suite/group_replication/t/gr_certifier_garbage_collection_with_clone.test
 share/mysql/test/suite/group_replication/t/gr_certifier_message_same_member-master.opt
 share/mysql/test/suite/group_replication/t/gr_certifier_message_same_member.test
-share/mysql/test/suite/group_replication/t/gr_change_master_hidden-master.opt
 share/mysql/test/suite/group_replication/t/gr_change_master_hidden.test
 share/mysql/test/suite/group_replication/t/gr_change_master_hidden_ps_protocol-master.opt
 share/mysql/test/suite/group_replication/t/gr_change_master_hidden_ps_protocol.test
 share/mysql/test/suite/group_replication/t/gr_change_master_not_replicated.test
+share/mysql/test/suite/group_replication/t/gr_channels_require_table_primary_key_check.test
 share/mysql/test/suite/group_replication/t/gr_check_count_tx_remote_applier_queue.test
 share/mysql/test/suite/group_replication/t/gr_check_stage_values_correctness.test
 share/mysql/test/suite/group_replication/t/gr_clone_applier_reset.test
@@ -5971,10 +6663,19 @@ share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_on_server_
 share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_on_server_start-slave.opt
 share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.cnf
 share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_on_server_start.test
+share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member-master.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member-slave.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_clone_operations_on_runnning_member.test
 share/mysql/test/suite/group_replication/t/gr_clone_integration_concurrent_shutdown.test
+share/mysql/test/suite/group_replication/t/gr_clone_integration_ddl_error-master.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_ddl_error-slave.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_ddl_error.test
 share/mysql/test/suite/group_replication/t/gr_clone_integration_different_recovery_user-master.opt
 share/mysql/test/suite/group_replication/t/gr_clone_integration_different_recovery_user-slave.opt
 share/mysql/test/suite/group_replication/t/gr_clone_integration_different_recovery_user.test
+share/mysql/test/suite/group_replication/t/gr_clone_integration_error_fallback-master.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_error_fallback-slave.opt
+share/mysql/test/suite/group_replication/t/gr_clone_integration_error_fallback.test
 share/mysql/test/suite/group_replication/t/gr_clone_integration_exit_state_action_on_clone_error-master.opt
 share/mysql/test/suite/group_replication/t/gr_clone_integration_exit_state_action_on_clone_error-slave.opt
 share/mysql/test/suite/group_replication/t/gr_clone_integration_exit_state_action_on_clone_error.test
@@ -6023,6 +6724,9 @@ share/mysql/test/suite/group_replication/t/gr_clone_integration_stop_primary_mem
 share/mysql/test/suite/group_replication/t/gr_clone_integration_stop_primary_member.cnf
 share/mysql/test/suite/group_replication/t/gr_clone_integration_stop_primary_member.test
 share/mysql/test/suite/group_replication/t/gr_clone_threshold_basic.test
+share/mysql/test/suite/group_replication/t/gr_clone_with_consistency_after-master.opt
+share/mysql/test/suite/group_replication/t/gr_clone_with_consistency_after-slave.opt
+share/mysql/test/suite/group_replication/t/gr_clone_with_consistency_after.test
 share/mysql/test/suite/group_replication/t/gr_collations_key_conflict.test
 share/mysql/test/suite/group_replication/t/gr_columns_partition_tables.cnf
 share/mysql/test/suite/group_replication/t/gr_columns_partition_tables.test
@@ -6072,6 +6776,10 @@ share/mysql/test/suite/group_replication/t/gr_consistent_reads_after_xa.test
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before.cnf
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before.test
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_and_after.test
+share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_and_after_mode_switch_to_multi.test
+share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_and_after_mode_switch_to_single.test
+share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_and_after_on_primary_election.test
+share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_and_after_on_primary_switch.test
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_parallel_stop.test
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_switch_group_mode.cnf
 share/mysql/test/suite/group_replication/t/gr_consistent_reads_before_switch_group_mode.test
@@ -6102,6 +6810,7 @@ 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_create_table_as_select.test
 share/mysql/test/suite/group_replication/t/gr_cross_version_compatiblity_change_during_recovery.cnf
 share/mysql/test/suite/group_replication/t/gr_cross_version_compatiblity_change_during_recovery.test
 share/mysql/test/suite/group_replication/t/gr_cross_version_lower_version_recovery_donor-master.opt
@@ -6233,11 +6942,16 @@ share/mysql/test/suite/group_replication/t/gr_incorrect_group_name_join.test
 share/mysql/test/suite/group_replication/t/gr_inject_join_error.test
 share/mysql/test/suite/group_replication/t/gr_inject_pipeline_error_local_gtid.test
 share/mysql/test/suite/group_replication/t/gr_inject_pipeline_error_remote_gtid.test
+share/mysql/test/suite/group_replication/t/gr_innodb_doublewrite_dir.cnf
+share/mysql/test/suite/group_replication/t/gr_innodb_doublewrite_dir.test
+share/mysql/test/suite/group_replication/t/gr_innodb_unknown_dir.test
 share/mysql/test/suite/group_replication/t/gr_install_and_reboot_are_safe.test
 share/mysql/test/suite/group_replication/t/gr_invoked_features.test
-share/mysql/test/suite/group_replication/t/gr_ip_whitelist_options-master.opt
-share/mysql/test/suite/group_replication/t/gr_ip_whitelist_options-slave.opt
-share/mysql/test/suite/group_replication/t/gr_ip_whitelist_options.test
+share/mysql/test/suite/group_replication/t/gr_ip_allowlist_options-master.opt
+share/mysql/test/suite/group_replication/t/gr_ip_allowlist_options-slave.opt
+share/mysql/test/suite/group_replication/t/gr_ip_allowlist_options.test
+share/mysql/test/suite/group_replication/t/gr_ip_allowlist_precedence.test
+share/mysql/test/suite/group_replication/t/gr_ip_whitelist_deprecation.test
 share/mysql/test/suite/group_replication/t/gr_join_with_suspect_member.cnf
 share/mysql/test/suite/group_replication/t/gr_join_with_suspect_member.test
 share/mysql/test/suite/group_replication/t/gr_json_array_unique_key_conflict.test
@@ -6280,6 +6994,7 @@ share/mysql/test/suite/group_replication/t/gr_member_expel_during_shutdown.test
 share/mysql/test/suite/group_replication/t/gr_member_expel_options.test
 share/mysql/test/suite/group_replication/t/gr_member_host_port.test
 share/mysql/test/suite/group_replication/t/gr_member_lengthy_hostname.test
+share/mysql/test/suite/group_replication/t/gr_message_cache_size_min.test
 share/mysql/test/suite/group_replication/t/gr_message_cache_size_options.test
 share/mysql/test/suite/group_replication/t/gr_message_cache_size_options_32bit.test
 share/mysql/test/suite/group_replication/t/gr_message_service-master.opt
@@ -6317,6 +7032,7 @@ share/mysql/test/suite/group_replication/t/gr_multiple_groups_in_group_seeds.cnf
 share/mysql/test/suite/group_replication/t/gr_multiple_groups_in_group_seeds.test
 share/mysql/test/suite/group_replication/t/gr_multiple_groups_with_same_name.cnf
 share/mysql/test/suite/group_replication/t/gr_multiple_groups_with_same_name.test
+share/mysql/test/suite/group_replication/t/gr_multiple_starts_after_clone.test
 share/mysql/test/suite/group_replication/t/gr_multiple_trigger.test
 share/mysql/test/suite/group_replication/t/gr_multiple_version_members.cnf
 share/mysql/test/suite/group_replication/t/gr_multiple_version_members.test
@@ -6328,6 +7044,7 @@ share/mysql/test/suite/group_replication/t/gr_network_partition_handling_after_r
 share/mysql/test/suite/group_replication/t/gr_no_user_start_failure-master.opt
 share/mysql/test/suite/group_replication/t/gr_no_user_start_failure.test
 share/mysql/test/suite/group_replication/t/gr_notifications_join_leave.test
+share/mysql/test/suite/group_replication/t/gr_notifications_mode_change.test
 share/mysql/test/suite/group_replication/t/gr_notifications_quorum.cnf
 share/mysql/test/suite/group_replication/t/gr_notifications_quorum.test
 share/mysql/test/suite/group_replication/t/gr_notifications_single_primary.cnf
@@ -6342,6 +7059,8 @@ share/mysql/test/suite/group_replication/t/gr_parallel_applier_sequential_indexe
 share/mysql/test/suite/group_replication/t/gr_parallel_applier_sequential_indexes.test
 share/mysql/test/suite/group_replication/t/gr_parallel_insert.test
 share/mysql/test/suite/group_replication/t/gr_parallel_inserts_same_server.test
+share/mysql/test/suite/group_replication/t/gr_parallel_start_stop.test
+share/mysql/test/suite/group_replication/t/gr_parallel_start_uninstall.test
 share/mysql/test/suite/group_replication/t/gr_parallel_stop_dml.test
 share/mysql/test/suite/group_replication/t/gr_parallel_update.test
 share/mysql/test/suite/group_replication/t/gr_parallel_update_same_server.test
@@ -6355,6 +7074,7 @@ share/mysql/test/suite/group_replication/t/gr_perfschema_connect_status-slave.op
 share/mysql/test/suite/group_replication/t/gr_perfschema_connect_status.test
 share/mysql/test/suite/group_replication/t/gr_perfschema_group_member_stats.test
 share/mysql/test/suite/group_replication/t/gr_perfschema_group_member_stats_additional_columns.test
+share/mysql/test/suite/group_replication/t/gr_perfschema_group_member_stats_bad_alloc.test
 share/mysql/test/suite/group_replication/t/gr_perfschema_group_members-master.opt
 share/mysql/test/suite/group_replication/t/gr_perfschema_group_members.test
 share/mysql/test/suite/group_replication/t/gr_perfschema_group_members_additional_columns.test
@@ -6391,6 +7111,7 @@ share/mysql/test/suite/group_replication/t/gr_primary_failover_consistency_wait_
 share/mysql/test/suite/group_replication/t/gr_primary_failover_consistency_when_on_multi_primary.test
 share/mysql/test/suite/group_replication/t/gr_primary_key_conflict.test
 share/mysql/test/suite/group_replication/t/gr_primary_key_conflict_xa.test
+share/mysql/test/suite/group_replication/t/gr_primary_key_on_invisible_column_conflict.test
 share/mysql/test/suite/group_replication/t/gr_primary_key_unique_conflict.test
 share/mysql/test/suite/group_replication/t/gr_primary_manual_failover_vs_consistent_reads_after.test
 share/mysql/test/suite/group_replication/t/gr_primary_manual_failover_vs_consistent_reads_before.test
@@ -6514,7 +7235,6 @@ share/mysql/test/suite/group_replication/t/gr_ps_applying_trx_recovery_channel.t
 share/mysql/test/suite/group_replication/t/gr_psi_keys-master.opt
 share/mysql/test/suite/group_replication/t/gr_psi_keys.test
 share/mysql/test/suite/group_replication/t/gr_random_password.test
-share/mysql/test/suite/group_replication/t/gr_random_view_id_generator-master.opt
 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
@@ -6540,6 +7260,7 @@ share/mysql/test/suite/group_replication/t/gr_recovery_channel-master.opt
 share/mysql/test/suite/group_replication/t/gr_recovery_channel.cnf
 share/mysql/test/suite/group_replication/t/gr_recovery_channel.test
 share/mysql/test/suite/group_replication/t/gr_recovery_channel_compression.test
+share/mysql/test/suite/group_replication/t/gr_recovery_clone_activation_threshold.test
 share/mysql/test/suite/group_replication/t/gr_recovery_completion_mode.test
 share/mysql/test/suite/group_replication/t/gr_recovery_completion_mode_failure.test
 share/mysql/test/suite/group_replication/t/gr_recovery_completion_mode_live_switch.test
@@ -6555,6 +7276,20 @@ share/mysql/test/suite/group_replication/t/gr_recovery_donor_public_key.test
 share/mysql/test/suite/group_replication/t/gr_recovery_donor_retry-slave.opt
 share/mysql/test/suite/group_replication/t/gr_recovery_donor_retry.test
 share/mysql/test/suite/group_replication/t/gr_recovery_double_view_update.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_invalid_conf.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_invalid_donor.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_ipv6_ipv4.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone-slave.opt
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_clone.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental-slave.opt
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.cnf
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_iterate_list_incremental.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.cnf
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_multiple_valid.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_no_fallback-slave.opt
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_no_fallback.test
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.cnf
+share/mysql/test/suite/group_replication/t/gr_recovery_endpoints_retry_clone.test
 share/mysql/test/suite/group_replication/t/gr_recovery_errors_report.test
 share/mysql/test/suite/group_replication/t/gr_recovery_fails_to_detect_thread_stop.cnf
 share/mysql/test/suite/group_replication/t/gr_recovery_fails_to_detect_thread_stop.test
@@ -6596,10 +7331,18 @@ 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_local_anonymous_server_to_group.cnf
+share/mysql/test/suite/group_replication/t/gr_replicate_local_anonymous_server_to_group.test
+share/mysql/test/suite/group_replication/t/gr_replicate_local_anonymous_server_to_group_error_cases.cnf
+share/mysql/test/suite/group_replication/t/gr_replicate_local_anonymous_server_to_group_error_cases.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
 share/mysql/test/suite/group_replication/t/gr_replicate_server_to_group_conflict.test
+share/mysql/test/suite/group_replication/t/gr_replicate_uuid_anonymous_server_to_group.cnf
+share/mysql/test/suite/group_replication/t/gr_replicate_uuid_anonymous_server_to_group.test
+share/mysql/test/suite/group_replication/t/gr_replicate_uuid_anonymous_server_to_group_error_cases.cnf
+share/mysql/test/suite/group_replication/t/gr_replicate_uuid_anonymous_server_to_group_error_cases.test
 share/mysql/test/suite/group_replication/t/gr_replication_timestamps.cnf
 share/mysql/test/suite/group_replication/t/gr_replication_timestamps.test
 share/mysql/test/suite/group_replication/t/gr_reset_master-master.opt
@@ -6716,22 +7459,41 @@ share/mysql/test/suite/group_replication/t/gr_ssl_mode-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_mode-slave.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_mode.test
 share/mysql/test/suite/group_replication/t/gr_ssl_mode_basic.test
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates-master.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates-slave.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_incompatible_certificates.test
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin-master.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin-slave.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.cnf
+share/mysql/test/suite/group_replication/t/gr_ssl_mode_tls_source_mysql_admin.test
 share/mysql/test/suite/group_replication/t/gr_ssl_mode_verify_identity_error-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_mode_verify_identity_error-slave.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_mode_verify_identity_error.test
+share/mysql/test/suite/group_replication/t/gr_ssl_on_admin_interface-master.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_on_admin_interface-slave.opt
+share/mysql/test/suite/group_replication/t/gr_ssl_on_admin_interface.cnf
+share/mysql/test/suite/group_replication/t/gr_ssl_on_admin_interface.test
 share/mysql/test/suite/group_replication/t/gr_ssl_options-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_options.test
 share/mysql/test/suite/group_replication/t/gr_ssl_options2-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_options2.test
 share/mysql/test/suite/group_replication/t/gr_ssl_tls13-master.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_tls13.test
-share/mysql/test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.cnf
+share/mysql/test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration-slave.opt
 share/mysql/test/suite/group_replication/t/gr_ssl_tls13_runtime_invalid_configuration.test
 share/mysql/test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.cnf
 share/mysql/test/suite/group_replication/t/gr_ssl_tls13_runtime_valid_configuration.test
 share/mysql/test/suite/group_replication/t/gr_stable_set_on_view_change.test
 share/mysql/test/suite/group_replication/t/gr_start_during_start.test
 share/mysql/test/suite/group_replication/t/gr_start_fail_restore_read_mode.test
+share/mysql/test/suite/group_replication/t/gr_start_gr_credential_options_clone.test
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials.test
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_2-master.opt
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_2-slave.opt
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_2.test
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_3-master.opt
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_3-slave.opt
+share/mysql/test/suite/group_replication/t/gr_start_gr_with_credentials_3.test
 share/mysql/test/suite/group_replication/t/gr_start_group_without_boot_node.test
 share/mysql/test/suite/group_replication/t/gr_start_on_boot-master.opt
 share/mysql/test/suite/group_replication/t/gr_start_on_boot.test
@@ -6772,6 +7534,7 @@ share/mysql/test/suite/group_replication/t/gr_startup_verifications_not_table_re
 share/mysql/test/suite/group_replication/t/gr_startup_verifications_not_table_repositories.test
 share/mysql/test/suite/group_replication/t/gr_stop_async_on_stop_gr-master.opt
 share/mysql/test/suite/group_replication/t/gr_stop_async_on_stop_gr.test
+share/mysql/test/suite/group_replication/t/gr_stop_during_pfs.test
 share/mysql/test/suite/group_replication/t/gr_stop_during_start.test
 share/mysql/test/suite/group_replication/t/gr_stop_gr_and_modify_wc_during_dml.cnf
 share/mysql/test/suite/group_replication/t/gr_stop_gr_and_modify_wc_during_dml.test
@@ -6785,6 +7548,7 @@ share/mysql/test/suite/group_replication/t/gr_stop_procedure_hang.test
 share/mysql/test/suite/group_replication/t/gr_stop_wait_udf_finish.test
 share/mysql/test/suite/group_replication/t/gr_stop_when_unreachable.cnf
 share/mysql/test/suite/group_replication/t/gr_stop_when_unreachable.test
+share/mysql/test/suite/group_replication/t/gr_stop_while_recovery_locked.test
 share/mysql/test/suite/group_replication/t/gr_stop_with_gtid_gaps.test
 share/mysql/test/suite/group_replication/t/gr_stop_with_gtid_gaps_applier.test
 share/mysql/test/suite/group_replication/t/gr_storage_engines.test
@@ -6832,6 +7596,7 @@ share/mysql/test/suite/group_replication/t/gr_view_changes.cnf
 share/mysql/test/suite/group_replication/t/gr_view_changes.test
 share/mysql/test/suite/group_replication/t/gr_wait_for_executed_gtid_set_no_timeout.test
 share/mysql/test/suite/group_replication/t/gr_wait_for_executed_gtid_set_with_sleep.test
+share/mysql/test/suite/group_replication/t/gr_with_credential_and_channel.test
 share/mysql/test/suite/group_replication/t/gr_without_perfschema.cnf
 share/mysql/test/suite/group_replication/t/gr_without_perfschema.test
 share/mysql/test/suite/group_replication/t/gr_write_concurrency.test
@@ -6875,7 +7640,6 @@ share/mysql/test/suite/innodb/include/atomic_truncate_table_crash_temp.inc
 share/mysql/test/suite/innodb/include/autoinc_persist_alter.inc
 share/mysql/test/suite/innodb/include/bootstrap_cleanup.inc
 share/mysql/test/suite/innodb/include/buf_wait_for_dirty_pages_added_up_to_lsn.inc
-share/mysql/test/suite/innodb/include/cats_config.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_secondary_index.inc
@@ -6889,18 +7653,18 @@ share/mysql/test/suite/innodb/include/default_row_format_create.inc
 share/mysql/test/suite/innodb/include/default_row_format_large.inc
 share/mysql/test/suite/innodb/include/default_row_format_show.inc
 share/mysql/test/suite/innodb/include/default_row_format_tablespace.inc
-share/mysql/test/suite/innodb/include/discourage_cats.inc
+share/mysql/test/suite/innodb/include/discarded_partition.inc
 share/mysql/test/suite/innodb/include/dml_ops.inc
 share/mysql/test/suite/innodb/include/drop_workload_itt.inc
 share/mysql/test/suite/innodb/include/evict_everything_from_buffer_pool.inc
 share/mysql/test/suite/innodb/include/explain_then_rollback_and_commit.inc
-share/mysql/test/suite/innodb/include/force_cats.inc
 share/mysql/test/suite/innodb/include/force_purge.inc
 share/mysql/test/suite/innodb/include/ibd2sdi_replace.inc
 share/mysql/test/suite/innodb/include/ibd2sdi_replace_mysql.inc
 share/mysql/test/suite/innodb/include/ibd2sdi_replace_pattern.inc
 share/mysql/test/suite/innodb/include/ibd2sdi_replace_system.inc
 share/mysql/test/suite/innodb/include/import.inc
+share/mysql/test/suite/innodb/include/innodb_autoextend_dml.inc
 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_bulk_inject_errors.inc
@@ -6942,6 +7706,8 @@ share/mysql/test/suite/innodb/include/prepare_secondary_index.inc
 share/mysql/test/suite/innodb/include/prepare_secondary_index_on_virtual.inc
 share/mysql/test/suite/innodb/include/prepare_secondary_indexs_on_virtual_and_normal.inc
 share/mysql/test/suite/innodb/include/query_workload_itt.inc
+share/mysql/test/suite/innodb/include/resume_test_encryption.inc
+share/mysql/test/suite/innodb/include/resume_test_unencryption.inc
 share/mysql/test/suite/innodb/include/show_i_s_tables.inc
 share/mysql/test/suite/innodb/include/show_i_s_tablespaces.inc
 share/mysql/test/suite/innodb/include/show_last_deadlock.inc
@@ -7000,6 +7766,7 @@ share/mysql/test/suite/innodb/r/create_drop_temp_table_perf_1.result
 share/mysql/test/suite/innodb/r/create_drop_temp_table_perf_debug.result
 share/mysql/test/suite/innodb/r/create_table.result
 share/mysql/test/suite/innodb/r/create_table_select.result
+share/mysql/test/suite/innodb/r/create_table_similar_to_fts.result
 share/mysql/test/suite/innodb/r/create_tablespace.result
 share/mysql/test/suite/innodb/r/create_tablespace_16k.result
 share/mysql/test/suite/innodb/r/create_tablespace_32k.result
@@ -7009,12 +7776,25 @@ share/mysql/test/suite/innodb/r/create_tablespace_8k.result
 share/mysql/test/suite/innodb/r/create_tablespace_debug.result
 share/mysql/test/suite/innodb/r/create_tablespace_partition.result
 share/mysql/test/suite/innodb/r/create_tablespace_replication.result
+share/mysql/test/suite/innodb/r/dblwr_disable.result
+share/mysql/test/suite/innodb/r/dblwr_encrypt.result
+share/mysql/test/suite/innodb/r/dblwr_encrypt_recover.result
+share/mysql/test/suite/innodb/r/dblwr_encrypt_recover1.result
+share/mysql/test/suite/innodb/r/dblwr_encrypt_rowcomp.result
+share/mysql/test/suite/innodb/r/dblwr_lz4_encrypt.result
+share/mysql/test/suite/innodb/r/dblwr_lz4_encrypt_recv.result
+share/mysql/test/suite/innodb/r/dblwr_recover_general_tablespace.result
+share/mysql/test/suite/innodb/r/dblwr_recover_zeroes.result
+share/mysql/test/suite/innodb/r/dblwr_unencrypt.result
+share/mysql/test/suite/innodb/r/dblwr_zlib_encrypt.result
+share/mysql/test/suite/innodb/r/dblwr_zlib_encrypt_recv.result
 share/mysql/test/suite/innodb/r/ddl_crash_alter_partition.result
 share/mysql/test/suite/innodb/r/ddl_crash_alter_table.result
 share/mysql/test/suite/innodb/r/ddl_crash_alter_table_partition.result
 share/mysql/test/suite/innodb/r/ddl_crash_alter_table_partition_tablespace.result
 share/mysql/test/suite/innodb/r/ddl_crash_alter_table_tablespace.result
 share/mysql/test/suite/innodb/r/ddl_crash_basic.result
+share/mysql/test/suite/innodb/r/ddl_log_error.result
 share/mysql/test/suite/innodb/r/deadlock_detect.result
 share/mysql/test/suite/innodb/r/deadlock_on_lock_upgrade.result
 share/mysql/test/suite/innodb/r/deadlock_stats.result
@@ -7022,8 +7802,12 @@ share/mysql/test/suite/innodb/r/default_row_format.result
 share/mysql/test/suite/innodb/r/default_row_format_16k.result
 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/discard_cfg_v4.result
+share/mysql/test/suite/innodb/r/dirty_invalid_page.result
 share/mysql/test/suite/innodb/r/discard_tablespace.result
+share/mysql/test/suite/innodb/r/discarded_partition.result
+share/mysql/test/suite/innodb/r/discarded_partition_create.result
+share/mysql/test/suite/innodb/r/discarded_partition_upgrade_from_57.result
+share/mysql/test/suite/innodb/r/discarded_partition_upgrade_from_80.result
 share/mysql/test/suite/innodb/r/dml_operations_temp_table.result
 share/mysql/test/suite/innodb/r/dml_operations_temp_table_debug.result
 share/mysql/test/suite/innodb/r/doublewrite.result
@@ -7032,10 +7816,12 @@ share/mysql/test/suite/innodb/r/end_range_check.result
 share/mysql/test/suite/innodb/r/end_range_check_2.result
 share/mysql/test/suite/innodb/r/events-merge-tmp-path.result
 share/mysql/test/suite/innodb/r/extern_relative_path.result
+share/mysql/test/suite/innodb/r/fast_shutdown.result
 share/mysql/test/suite/innodb/r/file_format_upgrade_16k.result
 share/mysql/test/suite/innodb/r/flush-hang.result
 share/mysql/test/suite/innodb/r/foreign_key.result
 share/mysql/test/suite/innodb/r/fts_exec_interrupt.result
+share/mysql/test/suite/innodb/r/gtid_shutdown.result
 share/mysql/test/suite/innodb/r/help_verbose.result
 share/mysql/test/suite/innodb/r/hidden_directory_dotfile.result
 share/mysql/test/suite/innodb/r/hidden_directory_win.result
@@ -7047,6 +7833,7 @@ share/mysql/test/suite/innodb/r/high_prio_trx_5.result
 share/mysql/test/suite/innodb/r/high_prio_trx_6.result
 share/mysql/test/suite/innodb/r/high_prio_trx_7.result
 share/mysql/test/suite/innodb/r/high_prio_trx_8.result
+share/mysql/test/suite/innodb/r/high_prio_trx_9.result
 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
@@ -7055,11 +7842,16 @@ share/mysql/test/suite/innodb/r/high_prio_trx_rpl.result
 share/mysql/test/suite/innodb/r/histogram-debug.result
 share/mysql/test/suite/innodb/r/histogram.result
 share/mysql/test/suite/innodb/r/i_s_files_debug.result
+share/mysql/test/suite/innodb/r/i_s_innodb_tables.result
 share/mysql/test/suite/innodb/r/ibd2sdi.result
 share/mysql/test/suite/innodb/r/ibuf_not_empty.result
 share/mysql/test/suite/innodb/r/implicit_to_explicit_conversion.result
 share/mysql/test/suite/innodb/r/import.result
 share/mysql/test/suite/innodb/r/import_5_7.result
+share/mysql/test/suite/innodb/r/import_cfg.result
+share/mysql/test/suite/innodb/r/import_compress_encrypt.result
+share/mysql/test/suite/innodb/r/import_compress_no_punch_hole.result
+share/mysql/test/suite/innodb/r/import_empty_instant_default.result
 share/mysql/test/suite/innodb/r/import_export_4k.result
 share/mysql/test/suite/innodb/r/import_tablespace_page_corrupt.result
 share/mysql/test/suite/innodb/r/import_tablespace_schema_missmatch.result
@@ -7118,6 +7910,12 @@ share/mysql/test/suite/innodb/r/innodb-update-insert.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
+share/mysql/test/suite/innodb/r/innodb_autoextend_dml_1.result
+share/mysql/test/suite/innodb/r/innodb_autoextend_dml_2.result
+share/mysql/test/suite/innodb/r/innodb_autoextend_import_export.result
+share/mysql/test/suite/innodb/r/innodb_autoextend_table_ddl.result
+share/mysql/test/suite/innodb/r/innodb_autoextend_tbsp_ddl.result
+share/mysql/test/suite/innodb/r/innodb_autoextend_upgrade.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_chunk_size_rounding.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_dump_pct.result
@@ -7148,7 +7946,10 @@ share/mysql/test/suite/innodb/r/innodb_bug26818787.result
 share/mysql/test/suite/innodb/r/innodb_bug29692250.result
 share/mysql/test/suite/innodb/r/innodb_bug30113362.result
 share/mysql/test/suite/innodb/r/innodb_bug30423.result
+share/mysql/test/suite/innodb/r/innodb_bug30594501.result
+share/mysql/test/suite/innodb/r/innodb_bug30899683.result
 share/mysql/test/suite/innodb/r/innodb_bug30919.result
+share/mysql/test/suite/innodb/r/innodb_bug31205266.result
 share/mysql/test/suite/innodb/r/innodb_bug34053.result
 share/mysql/test/suite/innodb/r/innodb_bug34300.result
 share/mysql/test/suite/innodb/r/innodb_bug35220.result
@@ -7202,16 +8003,20 @@ share/mysql/test/suite/innodb/r/innodb_bulk_create_index_replication.result
 share/mysql/test/suite/innodb/r/innodb_bulk_create_index_small.result
 share/mysql/test/suite/innodb/r/innodb_bulk_inject_errors.result
 share/mysql/test/suite/innodb/r/innodb_cats.result
-share/mysql/test/suite/innodb/r/innodb_cats_debug.result
 share/mysql/test/suite/innodb/r/innodb_collation_test.result
 share/mysql/test/suite/innodb/r/innodb_corrupt_bit.result
 share/mysql/test/suite/innodb/r/innodb_corrupt_readonly.result
 share/mysql/test/suite/innodb/r/innodb_ctype_ldml.result
 share/mysql/test/suite/innodb/r/innodb_deadlock_with_autoinc.result
+share/mysql/test/suite/innodb/r/innodb_doublewrite_dir_01.result
+share/mysql/test/suite/innodb/r/innodb_doublewrite_dir_02.result
+share/mysql/test/suite/innodb/r/innodb_extend_and_initialize_debug.result
+share/mysql/test/suite/innodb/r/innodb_extend_and_initialize_windows.result
 share/mysql/test/suite/innodb/r/innodb_file_limit_check.result
 share/mysql/test/suite/innodb/r/innodb_force_recovery.result
 share/mysql/test/suite/innodb/r/innodb_fts_limit_check.result
 share/mysql/test/suite/innodb/r/innodb_i_s_cached_indexes.result
+share/mysql/test/suite/innodb/r/innodb_i_s_columns.result
 share/mysql/test/suite/innodb/r/innodb_i_s_innodb_trx.result
 share/mysql/test/suite/innodb/r/innodb_i_s_multi_file_tablespace.result
 share/mysql/test/suite/innodb/r/innodb_idle_flush_pct.result
@@ -7222,6 +8027,7 @@ share/mysql/test/suite/innodb/r/innodb_misc1.result
 share/mysql/test/suite/innodb/r/innodb_multi_update.result
 share/mysql/test/suite/innodb/r/innodb_mysql.result
 share/mysql/test/suite/innodb/r/innodb_mysql_rbk.result
+share/mysql/test/suite/innodb/r/innodb_open_file_hang.result
 share/mysql/test/suite/innodb/r/innodb_page_size_func.result
 share/mysql/test/suite/innodb/r/innodb_pagesize_max_recordsize.result
 share/mysql/test/suite/innodb/r/innodb_prefix_index_check.result
@@ -7238,6 +8044,7 @@ share/mysql/test/suite/innodb/r/innodb_redo_debug_6.result
 share/mysql/test/suite/innodb/r/innodb_rename_index.result
 share/mysql/test/suite/innodb/r/innodb_rename_index_err.result
 share/mysql/test/suite/innodb/r/innodb_replace.result
+share/mysql/test/suite/innodb/r/innodb_row_log_read.result
 share/mysql/test/suite/innodb/r/innodb_stats.result
 share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc.result
 share/mysql/test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result
@@ -7257,11 +8064,13 @@ share/mysql/test/suite/innodb/r/innodb_stats_rename_table_if_exists.result
 share/mysql/test/suite/innodb/r/innodb_stats_sample_pages.result
 share/mysql/test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
 share/mysql/test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
+share/mysql/test/suite/innodb/r/innodb_sys_var_valgrind.result
 share/mysql/test/suite/innodb/r/innodb_tablespace.result
 share/mysql/test/suite/innodb/r/innodb_thread_concurrency_debug.result
 share/mysql/test/suite/innodb/r/innodb_timeout_rollback.result
 share/mysql/test/suite/innodb/r/innodb_trx_weight.result
 share/mysql/test/suite/innodb/r/innodb_upd_stats_if_needed_not_inited.result
+share/mysql/test/suite/innodb/r/innodb_update_rollback_gen_col.result
 share/mysql/test/suite/innodb/r/innodb_ut_format_name.result
 share/mysql/test/suite/innodb/r/insert_debug.result
 share/mysql/test/suite/innodb/r/instant_add_column_autoinc.result
@@ -7281,6 +8090,9 @@ share/mysql/test/suite/innodb/r/json_small_partial_update_03.result
 share/mysql/test/suite/innodb/r/json_small_partial_update_04.result
 share/mysql/test/suite/innodb/r/json_small_partial_update_05.result
 share/mysql/test/suite/innodb/r/json_small_partial_update_06.result
+share/mysql/test/suite/innodb/r/known_dir_unique_undo.result
+share/mysql/test/suite/innodb/r/known_directory.result
+share/mysql/test/suite/innodb/r/large_partitions_ddl.result
 share/mysql/test/suite/innodb/r/lob-being-modified-bit.result
 share/mysql/test/suite/innodb/r/lob-format.result
 share/mysql/test/suite/innodb/r/lob-read-uncommitted.result
@@ -7290,6 +8102,7 @@ share/mysql/test/suite/innodb/r/lob_big_rollback.result
 share/mysql/test/suite/innodb/r/lob_compact.result
 share/mysql/test/suite/innodb/r/lob_double_purge.result
 share/mysql/test/suite/innodb/r/lob_ibd_size.result
+share/mysql/test/suite/innodb/r/lob_ibd_size_replace.result
 share/mysql/test/suite/innodb/r/lob_import_export.result
 share/mysql/test/suite/innodb/r/lob_insert.result
 share/mysql/test/suite/innodb/r/lob_insert_noindex.result
@@ -7309,12 +8122,16 @@ share/mysql/test/suite/innodb/r/lob_rollback_deadlock.result
 share/mysql/test/suite/innodb/r/lob_rollback_problem_mini.result
 share/mysql/test/suite/innodb/r/lob_update.result
 share/mysql/test/suite/innodb/r/lob_vjhi.result
+share/mysql/test/suite/innodb/r/lock-inherit-existing.result
 share/mysql/test/suite/innodb/r/lock_contention.result
 share/mysql/test/suite/innodb/r/lock_contention_big.result
 share/mysql/test/suite/innodb/r/lock_end_of_range.result
+share/mysql/test/suite/innodb/r/lock_granted_before_waiting.result
 share/mysql/test/suite/innodb/r/lock_impl_to_expl.result
 share/mysql/test/suite/innodb/r/lock_impl_to_expl_case_sensitivity.result
 share/mysql/test/suite/innodb/r/lock_rec_unlock.result
+share/mysql/test/suite/innodb/r/lock_sys_resize.result
+share/mysql/test/suite/innodb/r/lock_trx_release_read_locks_in_x_mode.result
 share/mysql/test/suite/innodb/r/log_alter_table.result
 share/mysql/test/suite/innodb/r/log_buffer_size.result
 share/mysql/test/suite/innodb/r/log_corruption.result
@@ -7326,6 +8143,7 @@ share/mysql/test/suite/innodb/r/log_encrypt_3.result
 share/mysql/test/suite/innodb/r/log_encrypt_4.result
 share/mysql/test/suite/innodb/r/log_encrypt_5.result
 share/mysql/test/suite/innodb/r/log_encrypt_6.result
+share/mysql/test/suite/innodb/r/log_encrypt_7.result
 share/mysql/test/suite/innodb/r/log_encrypt_kill.result
 share/mysql/test/suite/innodb/r/log_file_name_1.result
 share/mysql/test/suite/innodb/r/log_file_name_discover.result
@@ -7336,6 +8154,7 @@ share/mysql/test/suite/innodb/r/log_file_system.result
 share/mysql/test/suite/innodb/r/log_first_rec_group.result
 share/mysql/test/suite/innodb/r/log_flush_order.result
 share/mysql/test/suite/innodb/r/log_spin_vars.result
+share/mysql/test/suite/innodb/r/log_writer_threads.result
 share/mysql/test/suite/innodb/r/long_deadlock_cycle.result
 share/mysql/test/suite/innodb/r/metadata_table_reference_count.result
 share/mysql/test/suite/innodb/r/missing_redologs.result
@@ -7359,6 +8178,8 @@ share/mysql/test/suite/innodb/r/mysqldump_max_recordsize.result
 share/mysql/test/suite/innodb/r/open_file_lru.result
 share/mysql/test/suite/innodb/r/optimizer_temporary_table.result
 share/mysql/test/suite/innodb/r/page_reorganize.result
+share/mysql/test/suite/innodb/r/parallel_read.result
+share/mysql/test/suite/innodb/r/parallel_read_kill.result
 share/mysql/test/suite/innodb/r/partition-16k.result
 share/mysql/test/suite/innodb/r/partition-blob.result
 share/mysql/test/suite/innodb/r/partition.result
@@ -7420,18 +8241,20 @@ share/mysql/test/suite/innodb/r/portability_basic.result
 share/mysql/test/suite/innodb/r/portability_tablespace.result
 share/mysql/test/suite/innodb/r/portability_tablespace_linux.result
 share/mysql/test/suite/innodb/r/portability_tablespace_windows.result
-share/mysql/test/suite/innodb/r/prepare_during_weight_update.result
 share/mysql/test/suite/innodb/r/readahead.result
 share/mysql/test/suite/innodb/r/readonly.result
+share/mysql/test/suite/innodb/r/rec_offsets.result
 share/mysql/test/suite/innodb/r/records_in_range.result
 share/mysql/test/suite/innodb/r/redo_log_archive_01.result
 share/mysql/test/suite/innodb/r/redo_log_archive_02.result
 share/mysql/test/suite/innodb/r/redo_log_archive_03.result
 share/mysql/test/suite/innodb/r/redo_log_archive_04.result
 share/mysql/test/suite/innodb/r/redo_log_archive_05.result
+share/mysql/test/suite/innodb/r/redo_log_disable.result
 share/mysql/test/suite/innodb/r/rename_fk_1.result
 share/mysql/test/suite/innodb/r/rename_fk_2.result
 share/mysql/test/suite/innodb/r/rename_table.result
+share/mysql/test/suite/innodb/r/row_format.result
 share/mysql/test/suite/innodb/r/row_format_redundant.result
 share/mysql/test/suite/innodb/r/sdi.result
 share/mysql/test/suite/innodb/r/sdi_compressed.result
@@ -7444,6 +8267,8 @@ share/mysql/test/suite/innodb/r/show_engine_status.result
 share/mysql/test/suite/innodb/r/shutdown_threads.result
 share/mysql/test/suite/innodb/r/skip_locked_nowait.result
 share/mysql/test/suite/innodb/r/skip_locked_nowait_isolation.result
+share/mysql/test/suite/innodb/r/skip_tablespace_path_validation.result
+share/mysql/test/suite/innodb/r/slow_shutdown.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
 share/mysql/test/suite/innodb/r/stored_fk.result
 share/mysql/test/suite/innodb/r/strict_checksum.result
@@ -7455,11 +8280,15 @@ share/mysql/test/suite/innodb/r/table_encrypt_2.result
 share/mysql/test/suite/innodb/r/table_encrypt_3.result
 share/mysql/test/suite/innodb/r/table_encrypt_4.result
 share/mysql/test/suite/innodb/r/table_encrypt_5.result
+share/mysql/test/suite/innodb/r/table_encrypt_6.result
 share/mysql/test/suite/innodb/r/table_encrypt_debug.result
+share/mysql/test/suite/innodb/r/table_encrypt_fts.result
 share/mysql/test/suite/innodb/r/table_encrypt_kill.result
 share/mysql/test/suite/innodb/r/table_encrypt_portable_32.result
 share/mysql/test/suite/innodb/r/table_encrypt_portable_64.result
 share/mysql/test/suite/innodb/r/tablespace_encrypt_1.result
+share/mysql/test/suite/innodb/r/tablespace_encrypt_10.result
+share/mysql/test/suite/innodb/r/tablespace_encrypt_11.result
 share/mysql/test/suite/innodb/r/tablespace_encrypt_2.result
 share/mysql/test/suite/innodb/r/tablespace_encrypt_3.result
 share/mysql/test/suite/innodb/r/tablespace_encrypt_4.result
@@ -7476,6 +8305,8 @@ share/mysql/test/suite/innodb/r/tablespace_portability_windows.result
 share/mysql/test/suite/innodb/r/tablespace_rename.result
 share/mysql/test/suite/innodb/r/tablespace_temp_table_1.result
 share/mysql/test/suite/innodb/r/tablespace_temp_table_debug.result
+share/mysql/test/suite/innodb/r/tablespace_truncate_stress.result
+share/mysql/test/suite/innodb/r/tablespace_truncate_stress_debug.result
 share/mysql/test/suite/innodb/r/temp_table.result
 share/mysql/test/suite/innodb/r/temp_table_savepoint.result
 share/mysql/test/suite/innodb/r/temporary_table.result
@@ -7495,8 +8326,10 @@ share/mysql/test/suite/innodb/r/undetected_deadlock.result
 share/mysql/test/suite/innodb/r/undo.result
 share/mysql/test/suite/innodb/r/undo_encrypt_basic.result
 share/mysql/test/suite/innodb/r/undo_encrypt_bootstrap.result
+share/mysql/test/suite/innodb/r/undo_encrypt_crash.result
 share/mysql/test/suite/innodb/r/undo_log_temp_table.result
 share/mysql/test/suite/innodb/r/undo_log_temp_table_debug.result
+share/mysql/test/suite/innodb/r/unknown_directory.result
 share/mysql/test/suite/innodb/r/update-cascade.result
 share/mysql/test/suite/innodb/r/update-ext.result
 share/mysql/test/suite/innodb/r/update_time.result
@@ -7504,8 +8337,12 @@ share/mysql/test/suite/innodb/r/update_time_is.result
 share/mysql/test/suite/innodb/r/upgrade_compressed_recv.result
 share/mysql/test/suite/innodb/r/upgrade_fts.result
 share/mysql/test/suite/innodb/r/upgrade_fts_aux.result
+share/mysql/test/suite/innodb/r/upgrade_fts_shared_tablespace.result
+share/mysql/test/suite/innodb/r/upgrade_geometry_56.result
+share/mysql/test/suite/innodb/r/upgrade_index_stats.result
 share/mysql/test/suite/innodb/r/upgrade_orphan.result
 share/mysql/test/suite/innodb/r/upgrade_partition.result
+share/mysql/test/suite/innodb/r/upgrade_unknown_directory.result
 share/mysql/test/suite/innodb/r/virtual_basic.result
 share/mysql/test/suite/innodb/r/virtual_blob.result
 share/mysql/test/suite/innodb/r/virtual_debug.result
@@ -7527,6 +8364,8 @@ share/mysql/test/suite/innodb/r/zlob_big_rollback.result
 share/mysql/test/suite/innodb/r/zlob_fragments.result
 share/mysql/test/suite/innodb/r/zlob_geom.result
 share/mysql/test/suite/innodb/r/zlob_ibd_size.result
+share/mysql/test/suite/innodb/r/zlob_ibd_size_replace.result
+share/mysql/test/suite/innodb/r/zlob_import_10mb.result
 share/mysql/test/suite/innodb/r/zlob_import_export.result
 share/mysql/test/suite/innodb/r/zlob_insert_by_update.result
 share/mysql/test/suite/innodb/r/zlob_long_partial_update.result
@@ -7600,20 +8439,24 @@ share/mysql/test/suite/innodb/t/check_ibd_filesize_16k.test
 share/mysql/test/suite/innodb/t/check_sector_size-master.opt
 share/mysql/test/suite/innodb/t/check_sector_size.test
 share/mysql/test/suite/innodb/t/checksum.test
+share/mysql/test/suite/innodb/t/choose_tbsp_location-alter-master.opt
 share/mysql/test/suite/innodb/t/choose_tbsp_location-alter.test
+share/mysql/test/suite/innodb/t/choose_tbsp_location-debug-master.opt
 share/mysql/test/suite/innodb/t/choose_tbsp_location-debug.test
+share/mysql/test/suite/innodb/t/choose_tbsp_location-discard-master.opt
 share/mysql/test/suite/innodb/t/choose_tbsp_location-discard.test
 share/mysql/test/suite/innodb/t/cmp_per_index-master.opt
 share/mysql/test/suite/innodb/t/cmp_per_index.test
 share/mysql/test/suite/innodb/t/constraint_check_locks_in_read_committed.test
 share/mysql/test/suite/innodb/t/crc32_endianness-master.opt
 share/mysql/test/suite/innodb/t/crc32_endianness.test
-share/mysql/test/suite/innodb/t/crc32_endianness.zip
 share/mysql/test/suite/innodb/t/create-index.test
 share/mysql/test/suite/innodb/t/create_drop_temp_table_perf_1.test
 share/mysql/test/suite/innodb/t/create_drop_temp_table_perf_debug.test
 share/mysql/test/suite/innodb/t/create_table.test
 share/mysql/test/suite/innodb/t/create_table_select.test
+share/mysql/test/suite/innodb/t/create_table_similar_to_fts.test
+share/mysql/test/suite/innodb/t/create_tablespace-master.opt
 share/mysql/test/suite/innodb/t/create_tablespace.test
 share/mysql/test/suite/innodb/t/create_tablespace_16k-master.opt
 share/mysql/test/suite/innodb/t/create_tablespace_16k.test
@@ -7628,12 +8471,36 @@ share/mysql/test/suite/innodb/t/create_tablespace_8k.test
 share/mysql/test/suite/innodb/t/create_tablespace_debug.test
 share/mysql/test/suite/innodb/t/create_tablespace_partition.test
 share/mysql/test/suite/innodb/t/create_tablespace_replication.test
+share/mysql/test/suite/innodb/t/dblwr_disable-master.opt
+share/mysql/test/suite/innodb/t/dblwr_disable.test
+share/mysql/test/suite/innodb/t/dblwr_encrypt-master.opt
+share/mysql/test/suite/innodb/t/dblwr_encrypt.test
+share/mysql/test/suite/innodb/t/dblwr_encrypt_recover-master.opt
+share/mysql/test/suite/innodb/t/dblwr_encrypt_recover.test
+share/mysql/test/suite/innodb/t/dblwr_encrypt_recover1-master.opt
+share/mysql/test/suite/innodb/t/dblwr_encrypt_recover1.test
+share/mysql/test/suite/innodb/t/dblwr_encrypt_rowcomp-master.opt
+share/mysql/test/suite/innodb/t/dblwr_encrypt_rowcomp.test
+share/mysql/test/suite/innodb/t/dblwr_lz4_encrypt-master.opt
+share/mysql/test/suite/innodb/t/dblwr_lz4_encrypt.test
+share/mysql/test/suite/innodb/t/dblwr_lz4_encrypt_recv-master.opt
+share/mysql/test/suite/innodb/t/dblwr_lz4_encrypt_recv.test
+share/mysql/test/suite/innodb/t/dblwr_recover_general_tablespace-master.opt
+share/mysql/test/suite/innodb/t/dblwr_recover_general_tablespace.test
+share/mysql/test/suite/innodb/t/dblwr_recover_zeroes-master.opt
+share/mysql/test/suite/innodb/t/dblwr_recover_zeroes.test
+share/mysql/test/suite/innodb/t/dblwr_unencrypt.test
+share/mysql/test/suite/innodb/t/dblwr_zlib_encrypt-master.opt
+share/mysql/test/suite/innodb/t/dblwr_zlib_encrypt.test
+share/mysql/test/suite/innodb/t/dblwr_zlib_encrypt_recv-master.opt
+share/mysql/test/suite/innodb/t/dblwr_zlib_encrypt_recv.test
 share/mysql/test/suite/innodb/t/ddl_crash_alter_partition.test
 share/mysql/test/suite/innodb/t/ddl_crash_alter_table.test
 share/mysql/test/suite/innodb/t/ddl_crash_alter_table_partition.test
 share/mysql/test/suite/innodb/t/ddl_crash_alter_table_partition_tablespace.test
 share/mysql/test/suite/innodb/t/ddl_crash_alter_table_tablespace.test
 share/mysql/test/suite/innodb/t/ddl_crash_basic.test
+share/mysql/test/suite/innodb/t/ddl_log_error.test
 share/mysql/test/suite/innodb/t/deadlock_detect.test
 share/mysql/test/suite/innodb/t/deadlock_on_lock_upgrade.test
 share/mysql/test/suite/innodb/t/deadlock_stats.test
@@ -7643,8 +8510,13 @@ share/mysql/test/suite/innodb/t/default_row_format_16k.test
 share/mysql/test/suite/innodb/t/default_row_format_compatibility-master.opt
 share/mysql/test/suite/innodb/t/default_row_format_compatibility.test
 share/mysql/test/suite/innodb/t/default_row_format_tablespace.test
-share/mysql/test/suite/innodb/t/discard_cfg_v4.test
+share/mysql/test/suite/innodb/t/dirty_invalid_page-master.opt
+share/mysql/test/suite/innodb/t/dirty_invalid_page.test
 share/mysql/test/suite/innodb/t/discard_tablespace.test
+share/mysql/test/suite/innodb/t/discarded_partition.test
+share/mysql/test/suite/innodb/t/discarded_partition_create.test
+share/mysql/test/suite/innodb/t/discarded_partition_upgrade_from_57.test
+share/mysql/test/suite/innodb/t/discarded_partition_upgrade_from_80.test
 share/mysql/test/suite/innodb/t/dml_operations_temp_table.test
 share/mysql/test/suite/innodb/t/dml_operations_temp_table_debug.test
 share/mysql/test/suite/innodb/t/doublewrite.test
@@ -7655,11 +8527,14 @@ share/mysql/test/suite/innodb/t/events-merge-tmp-path-master.opt
 share/mysql/test/suite/innodb/t/events-merge-tmp-path.test
 share/mysql/test/suite/innodb/t/extern_relative_path-master.opt
 share/mysql/test/suite/innodb/t/extern_relative_path.test
+share/mysql/test/suite/innodb/t/fast_shutdown.test
 share/mysql/test/suite/innodb/t/file_format_upgrade_16k-master.opt
 share/mysql/test/suite/innodb/t/file_format_upgrade_16k.test
 share/mysql/test/suite/innodb/t/flush-hang.test
 share/mysql/test/suite/innodb/t/foreign_key.test
 share/mysql/test/suite/innodb/t/fts_exec_interrupt.test
+share/mysql/test/suite/innodb/t/gtid_shutdown-master.opt
+share/mysql/test/suite/innodb/t/gtid_shutdown.test
 share/mysql/test/suite/innodb/t/help_verbose.test
 share/mysql/test/suite/innodb/t/hidden_directory_dotfile.test
 share/mysql/test/suite/innodb/t/hidden_directory_win.test
@@ -7671,6 +8546,7 @@ share/mysql/test/suite/innodb/t/high_prio_trx_5.test
 share/mysql/test/suite/innodb/t/high_prio_trx_6.test
 share/mysql/test/suite/innodb/t/high_prio_trx_7.test
 share/mysql/test/suite/innodb/t/high_prio_trx_8.test
+share/mysql/test/suite/innodb/t/high_prio_trx_9.test
 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
@@ -7680,6 +8556,7 @@ share/mysql/test/suite/innodb/t/histogram-debug.test
 share/mysql/test/suite/innodb/t/histogram-master.opt
 share/mysql/test/suite/innodb/t/histogram.test
 share/mysql/test/suite/innodb/t/i_s_files_debug.test
+share/mysql/test/suite/innodb/t/i_s_innodb_tables.test
 share/mysql/test/suite/innodb/t/ibd2sdi-master.opt
 share/mysql/test/suite/innodb/t/ibd2sdi.test
 share/mysql/test/suite/innodb/t/ibuf_not_empty-master.opt
@@ -7688,9 +8565,14 @@ share/mysql/test/suite/innodb/t/implicit_to_explicit_conversion.test
 share/mysql/test/suite/innodb/t/import.test
 share/mysql/test/suite/innodb/t/import_5_7-master.opt
 share/mysql/test/suite/innodb/t/import_5_7.test
+share/mysql/test/suite/innodb/t/import_cfg.test
+share/mysql/test/suite/innodb/t/import_compress_encrypt.test
+share/mysql/test/suite/innodb/t/import_compress_no_punch_hole.test
+share/mysql/test/suite/innodb/t/import_empty_instant_default.test
 share/mysql/test/suite/innodb/t/import_export_4k-master.opt
 share/mysql/test/suite/innodb/t/import_export_4k.test
 share/mysql/test/suite/innodb/t/import_tablespace_page_corrupt.test
+share/mysql/test/suite/innodb/t/import_tablespace_schema_missmatch-master.opt
 share/mysql/test/suite/innodb/t/import_tablespace_schema_missmatch.test
 share/mysql/test/suite/innodb/t/import_update_stats.test
 share/mysql/test/suite/innodb/t/index-lock-mode.test
@@ -7768,6 +8650,13 @@ share/mysql/test/suite/innodb/t/innodb_32k-master.opt
 share/mysql/test/suite/innodb/t/innodb_32k.test
 share/mysql/test/suite/innodb/t/innodb_64k-master.opt
 share/mysql/test/suite/innodb/t/innodb_64k.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_dml_1.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_dml_2.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_import_export-master.opt
+share/mysql/test/suite/innodb/t/innodb_autoextend_import_export.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_table_ddl.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_tbsp_ddl.test
+share/mysql/test/suite/innodb/t/innodb_autoextend_upgrade.test
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
 share/mysql/test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_chunk_size_rounding.test
@@ -7811,8 +8700,12 @@ share/mysql/test/suite/innodb/t/innodb_bug29692250-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug29692250.test
 share/mysql/test/suite/innodb/t/innodb_bug30113362.test
 share/mysql/test/suite/innodb/t/innodb_bug30423.test
+share/mysql/test/suite/innodb/t/innodb_bug30594501-master.opt
+share/mysql/test/suite/innodb/t/innodb_bug30594501.test
+share/mysql/test/suite/innodb/t/innodb_bug30899683.test
 share/mysql/test/suite/innodb/t/innodb_bug30919-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug30919.test
+share/mysql/test/suite/innodb/t/innodb_bug31205266.test
 share/mysql/test/suite/innodb/t/innodb_bug34053.test
 share/mysql/test/suite/innodb/t/innodb_bug34300.test
 share/mysql/test/suite/innodb/t/innodb_bug35220.test
@@ -7871,7 +8764,6 @@ share/mysql/test/suite/innodb/t/innodb_bulk_create_index_replication.test
 share/mysql/test/suite/innodb/t/innodb_bulk_create_index_small.test
 share/mysql/test/suite/innodb/t/innodb_bulk_inject_errors.test
 share/mysql/test/suite/innodb/t/innodb_cats.test
-share/mysql/test/suite/innodb/t/innodb_cats_debug.test
 share/mysql/test/suite/innodb/t/innodb_collation_test.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_bit.test
 share/mysql/test/suite/innodb/t/innodb_corrupt_readonly.test
@@ -7879,10 +8771,17 @@ share/mysql/test/suite/innodb/t/innodb_ctype_ldml-master.opt
 share/mysql/test/suite/innodb/t/innodb_ctype_ldml.test
 share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc-master.opt
 share/mysql/test/suite/innodb/t/innodb_deadlock_with_autoinc.test
+share/mysql/test/suite/innodb/t/innodb_doublewrite_dir_01-master.opt
+share/mysql/test/suite/innodb/t/innodb_doublewrite_dir_01.test
+share/mysql/test/suite/innodb/t/innodb_doublewrite_dir_02-master.opt
+share/mysql/test/suite/innodb/t/innodb_doublewrite_dir_02.test
+share/mysql/test/suite/innodb/t/innodb_extend_and_initialize_debug.test
+share/mysql/test/suite/innodb/t/innodb_extend_and_initialize_windows.test
 share/mysql/test/suite/innodb/t/innodb_file_limit_check.test
 share/mysql/test/suite/innodb/t/innodb_force_recovery.test
 share/mysql/test/suite/innodb/t/innodb_fts_limit_check.test
 share/mysql/test/suite/innodb/t/innodb_i_s_cached_indexes.test
+share/mysql/test/suite/innodb/t/innodb_i_s_columns.test
 share/mysql/test/suite/innodb/t/innodb_i_s_innodb_trx.test
 share/mysql/test/suite/innodb/t/innodb_i_s_multi_file_tablespace-master.opt
 share/mysql/test/suite/innodb/t/innodb_i_s_multi_file_tablespace.test
@@ -7898,11 +8797,14 @@ share/mysql/test/suite/innodb/t/innodb_mysql-master.opt
 share/mysql/test/suite/innodb/t/innodb_mysql.test
 share/mysql/test/suite/innodb/t/innodb_mysql_rbk-master.opt
 share/mysql/test/suite/innodb/t/innodb_mysql_rbk.test
+share/mysql/test/suite/innodb/t/innodb_open_file_hang-master.opt
+share/mysql/test/suite/innodb/t/innodb_open_file_hang.test
 share/mysql/test/suite/innodb/t/innodb_page_size_func.test
 share/mysql/test/suite/innodb/t/innodb_pagesize_max_recordsize.test
 share/mysql/test/suite/innodb/t/innodb_prefix_index_check.test
 share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server-master.opt
 share/mysql/test/suite/innodb/t/innodb_prefix_index_restart_server.test
+share/mysql/test/suite/innodb/t/innodb_read_only-1-master.opt
 share/mysql/test/suite/innodb/t/innodb_read_only-1.test
 share/mysql/test/suite/innodb/t/innodb_read_only-2.test
 share/mysql/test/suite/innodb/t/innodb_read_only.test
@@ -7916,6 +8818,7 @@ share/mysql/test/suite/innodb/t/innodb_rename_index.test
 share/mysql/test/suite/innodb/t/innodb_rename_index_err.test
 share/mysql/test/suite/innodb/t/innodb_replace-master.opt
 share/mysql/test/suite/innodb/t/innodb_replace.test
+share/mysql/test/suite/innodb/t/innodb_row_log_read.test
 share/mysql/test/suite/innodb/t/innodb_stats.test
 share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc-master.opt
 share/mysql/test/suite/innodb/t/innodb_stats_auto_recalc.test
@@ -7941,12 +8844,14 @@ share/mysql/test/suite/innodb/t/innodb_stats_sample_pages-master.opt
 share/mysql/test/suite/innodb/t/innodb_stats_sample_pages.test
 share/mysql/test/suite/innodb/t/innodb_stats_table_flag_auto_recalc.test
 share/mysql/test/suite/innodb/t/innodb_stats_table_flag_sample_pages.test
+share/mysql/test/suite/innodb/t/innodb_sys_var_valgrind.test
 share/mysql/test/suite/innodb/t/innodb_tablespace.test
 share/mysql/test/suite/innodb/t/innodb_thread_concurrency_debug.test
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback-master.opt
 share/mysql/test/suite/innodb/t/innodb_timeout_rollback.test
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
 share/mysql/test/suite/innodb/t/innodb_upd_stats_if_needed_not_inited.test
+share/mysql/test/suite/innodb/t/innodb_update_rollback_gen_col.test
 share/mysql/test/suite/innodb/t/innodb_ut_format_name.test
 share/mysql/test/suite/innodb/t/insert_debug.test
 share/mysql/test/suite/innodb/t/instant_add_column_autoinc.test
@@ -7967,6 +8872,11 @@ share/mysql/test/suite/innodb/t/json_small_partial_update_03.test
 share/mysql/test/suite/innodb/t/json_small_partial_update_04.test
 share/mysql/test/suite/innodb/t/json_small_partial_update_05.test
 share/mysql/test/suite/innodb/t/json_small_partial_update_06.test
+share/mysql/test/suite/innodb/t/known_dir_unique_undo-master.opt
+share/mysql/test/suite/innodb/t/known_dir_unique_undo.test
+share/mysql/test/suite/innodb/t/known_directory-master.opt
+share/mysql/test/suite/innodb/t/known_directory.test
+share/mysql/test/suite/innodb/t/large_partitions_ddl.test
 share/mysql/test/suite/innodb/t/lob-being-modified-bit.test
 share/mysql/test/suite/innodb/t/lob-format.test
 share/mysql/test/suite/innodb/t/lob-read-uncommitted.test
@@ -7978,6 +8888,7 @@ share/mysql/test/suite/innodb/t/lob_big_rollback.test
 share/mysql/test/suite/innodb/t/lob_compact.test
 share/mysql/test/suite/innodb/t/lob_double_purge.test
 share/mysql/test/suite/innodb/t/lob_ibd_size.test
+share/mysql/test/suite/innodb/t/lob_ibd_size_replace.test
 share/mysql/test/suite/innodb/t/lob_import_export.test
 share/mysql/test/suite/innodb/t/lob_insert.test
 share/mysql/test/suite/innodb/t/lob_insert_noindex.test
@@ -8000,35 +8911,26 @@ share/mysql/test/suite/innodb/t/lob_rollback_deadlock.test
 share/mysql/test/suite/innodb/t/lob_rollback_problem_mini.test
 share/mysql/test/suite/innodb/t/lob_update.test
 share/mysql/test/suite/innodb/t/lob_vjhi.test
+share/mysql/test/suite/innodb/t/lock-inherit-existing.test
 share/mysql/test/suite/innodb/t/lock_contention-master.opt
 share/mysql/test/suite/innodb/t/lock_contention.test
 share/mysql/test/suite/innodb/t/lock_contention_big.test
 share/mysql/test/suite/innodb/t/lock_end_of_range.test
+share/mysql/test/suite/innodb/t/lock_granted_before_waiting.test
 share/mysql/test/suite/innodb/t/lock_impl_to_expl.test
 share/mysql/test/suite/innodb/t/lock_impl_to_expl_case_sensitivity.test
 share/mysql/test/suite/innodb/t/lock_rec_unlock.test
+share/mysql/test/suite/innodb/t/lock_sys_resize-master.opt
+share/mysql/test/suite/innodb/t/lock_sys_resize.test
+share/mysql/test/suite/innodb/t/lock_trx_release_read_locks_in_x_mode.test
 share/mysql/test/suite/innodb/t/log_alter_table.test
 share/mysql/test/suite/innodb/t/log_buffer_size.test
 share/mysql/test/suite/innodb/t/log_corruption-master.opt
 share/mysql/test/suite/innodb/t/log_corruption.test
-share/mysql/test/suite/innodb/t/log_corruption.zip
-share/mysql/test/suite/innodb/t/log_corruption0.zip
-share/mysql/test/suite/innodb/t/log_corruption1.zip
-share/mysql/test/suite/innodb/t/log_corruption2.zip
-share/mysql/test/suite/innodb/t/log_corruption3.zip
-share/mysql/test/suite/innodb/t/log_corruption4.zip
-share/mysql/test/suite/innodb/t/log_corruption4a.zip
-share/mysql/test/suite/innodb/t/log_corruption4b.zip
-share/mysql/test/suite/innodb/t/log_corruption4c.zip
-share/mysql/test/suite/innodb/t/log_corruption4d.zip
-share/mysql/test/suite/innodb/t/log_corruption5.zip
-share/mysql/test/suite/innodb/t/log_corruption6.zip
-share/mysql/test/suite/innodb/t/log_corruption6b.zip
-share/mysql/test/suite/innodb/t/log_corruption7.zip
 share/mysql/test/suite/innodb/t/log_corruption_1-master.opt
 share/mysql/test/suite/innodb/t/log_corruption_1.test
-share/mysql/test/suite/innodb/t/log_corruption_1.zip
 share/mysql/test/suite/innodb/t/log_ddl_must_flush.test
+share/mysql/test/suite/innodb/t/log_encrypt_1-master.opt
 share/mysql/test/suite/innodb/t/log_encrypt_1.test
 share/mysql/test/suite/innodb/t/log_encrypt_2-master.opt
 share/mysql/test/suite/innodb/t/log_encrypt_2.test
@@ -8037,6 +8939,7 @@ share/mysql/test/suite/innodb/t/log_encrypt_3.test
 share/mysql/test/suite/innodb/t/log_encrypt_4.test
 share/mysql/test/suite/innodb/t/log_encrypt_5.test
 share/mysql/test/suite/innodb/t/log_encrypt_6.test
+share/mysql/test/suite/innodb/t/log_encrypt_7.test
 share/mysql/test/suite/innodb/t/log_encrypt_kill.test
 share/mysql/test/suite/innodb/t/log_file_name_1-master.opt
 share/mysql/test/suite/innodb/t/log_file_name_1.test
@@ -8050,6 +8953,7 @@ share/mysql/test/suite/innodb/t/log_first_rec_group-master.opt
 share/mysql/test/suite/innodb/t/log_first_rec_group.test
 share/mysql/test/suite/innodb/t/log_flush_order.test
 share/mysql/test/suite/innodb/t/log_spin_vars.test
+share/mysql/test/suite/innodb/t/log_writer_threads.test
 share/mysql/test/suite/innodb/t/long_deadlock_cycle.test
 share/mysql/test/suite/innodb/t/metadata_table_reference_count-master.opt
 share/mysql/test/suite/innodb/t/metadata_table_reference_count.test
@@ -8082,6 +8986,8 @@ share/mysql/test/suite/innodb/t/optimizer_temporary_table-master.opt
 share/mysql/test/suite/innodb/t/optimizer_temporary_table.test
 share/mysql/test/suite/innodb/t/page_reorganize-master.opt
 share/mysql/test/suite/innodb/t/page_reorganize.test
+share/mysql/test/suite/innodb/t/parallel_read.test
+share/mysql/test/suite/innodb/t/parallel_read_kill.test
 share/mysql/test/suite/innodb/t/partition-16k-master.opt
 share/mysql/test/suite/innodb/t/partition-16k.test
 share/mysql/test/suite/innodb/t/partition-blob.test
@@ -8153,9 +9059,9 @@ share/mysql/test/suite/innodb/t/portability_basic.test
 share/mysql/test/suite/innodb/t/portability_tablespace.test
 share/mysql/test/suite/innodb/t/portability_tablespace_linux.test
 share/mysql/test/suite/innodb/t/portability_tablespace_windows.test
-share/mysql/test/suite/innodb/t/prepare_during_weight_update.test
 share/mysql/test/suite/innodb/t/readahead.test
 share/mysql/test/suite/innodb/t/readonly.test
+share/mysql/test/suite/innodb/t/rec_offsets.test
 share/mysql/test/suite/innodb/t/records_in_range.test
 share/mysql/test/suite/innodb/t/redo_log_archive_01-master.opt
 share/mysql/test/suite/innodb/t/redo_log_archive_01.test
@@ -8167,9 +9073,11 @@ share/mysql/test/suite/innodb/t/redo_log_archive_04-master.opt
 share/mysql/test/suite/innodb/t/redo_log_archive_04.test
 share/mysql/test/suite/innodb/t/redo_log_archive_05-master.opt
 share/mysql/test/suite/innodb/t/redo_log_archive_05.test
+share/mysql/test/suite/innodb/t/redo_log_disable.test
 share/mysql/test/suite/innodb/t/rename_fk_1.test
 share/mysql/test/suite/innodb/t/rename_fk_2.test
 share/mysql/test/suite/innodb/t/rename_table.test
+share/mysql/test/suite/innodb/t/row_format.test
 share/mysql/test/suite/innodb/t/row_format_redundant.test
 share/mysql/test/suite/innodb/t/sdi.test
 share/mysql/test/suite/innodb/t/sdi_compressed.test
@@ -8182,26 +9090,37 @@ share/mysql/test/suite/innodb/t/show_engine_status.test
 share/mysql/test/suite/innodb/t/shutdown_threads.test
 share/mysql/test/suite/innodb/t/skip_locked_nowait.test
 share/mysql/test/suite/innodb/t/skip_locked_nowait_isolation.test
+share/mysql/test/suite/innodb/t/skip_tablespace_path_validation.test
+share/mysql/test/suite/innodb/t/slow_shutdown.test
 share/mysql/test/suite/innodb/t/sp_temp_table.test
 share/mysql/test/suite/innodb/t/stored_fk.test
 share/mysql/test/suite/innodb/t/strict_checksum.test
 share/mysql/test/suite/innodb/t/strict_mode.test
 share/mysql/test/suite/innodb/t/subpartition.test
 share/mysql/test/suite/innodb/t/table_compress.test
+share/mysql/test/suite/innodb/t/table_encrypt_1-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_1.test
 share/mysql/test/suite/innodb/t/table_encrypt_2-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_2.test
 share/mysql/test/suite/innodb/t/table_encrypt_3.test
+share/mysql/test/suite/innodb/t/table_encrypt_4-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_4.test
 share/mysql/test/suite/innodb/t/table_encrypt_5-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_5.test
+share/mysql/test/suite/innodb/t/table_encrypt_6.test
+share/mysql/test/suite/innodb/t/table_encrypt_debug-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_debug.test
+share/mysql/test/suite/innodb/t/table_encrypt_fts.test
 share/mysql/test/suite/innodb/t/table_encrypt_kill-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_kill.test
+share/mysql/test/suite/innodb/t/table_encrypt_portable_32-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_portable_32.test
+share/mysql/test/suite/innodb/t/table_encrypt_portable_64-master.opt
 share/mysql/test/suite/innodb/t/table_encrypt_portable_64.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_1-master.opt
 share/mysql/test/suite/innodb/t/tablespace_encrypt_1.test
+share/mysql/test/suite/innodb/t/tablespace_encrypt_10.test
+share/mysql/test/suite/innodb/t/tablespace_encrypt_11.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_2-master.opt
 share/mysql/test/suite/innodb/t/tablespace_encrypt_2.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_3.test
@@ -8213,6 +9132,7 @@ share/mysql/test/suite/innodb/t/tablespace_encrypt_6.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_7.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_8.test
 share/mysql/test/suite/innodb/t/tablespace_encrypt_9.test
+share/mysql/test/suite/innodb/t/tablespace_per_table-master.opt
 share/mysql/test/suite/innodb/t/tablespace_per_table.test
 share/mysql/test/suite/innodb/t/tablespace_per_table_not_windows.test
 share/mysql/test/suite/innodb/t/tablespace_per_table_windows.test
@@ -8223,6 +9143,10 @@ share/mysql/test/suite/innodb/t/tablespace_portability_windows.test
 share/mysql/test/suite/innodb/t/tablespace_rename.test
 share/mysql/test/suite/innodb/t/tablespace_temp_table_1.test
 share/mysql/test/suite/innodb/t/tablespace_temp_table_debug.test
+share/mysql/test/suite/innodb/t/tablespace_truncate_stress-master.opt
+share/mysql/test/suite/innodb/t/tablespace_truncate_stress.test
+share/mysql/test/suite/innodb/t/tablespace_truncate_stress_debug-master.opt
+share/mysql/test/suite/innodb/t/tablespace_truncate_stress_debug.test
 share/mysql/test/suite/innodb/t/temp_table.test
 share/mysql/test/suite/innodb/t/temp_table_savepoint.test
 share/mysql/test/suite/innodb/t/temporary_table.test
@@ -8242,8 +9166,10 @@ share/mysql/test/suite/innodb/t/undetected_deadlock.test
 share/mysql/test/suite/innodb/t/undo.test
 share/mysql/test/suite/innodb/t/undo_encrypt_basic.test
 share/mysql/test/suite/innodb/t/undo_encrypt_bootstrap.test
+share/mysql/test/suite/innodb/t/undo_encrypt_crash.test
 share/mysql/test/suite/innodb/t/undo_log_temp_table.test
 share/mysql/test/suite/innodb/t/undo_log_temp_table_debug.test
+share/mysql/test/suite/innodb/t/unknown_directory.test
 share/mysql/test/suite/innodb/t/update-cascade.test
 share/mysql/test/suite/innodb/t/update-ext.test
 share/mysql/test/suite/innodb/t/update_time-master.opt
@@ -8253,8 +9179,12 @@ share/mysql/test/suite/innodb/t/upgrade_compressed_recv-master.opt
 share/mysql/test/suite/innodb/t/upgrade_compressed_recv.test
 share/mysql/test/suite/innodb/t/upgrade_fts.test
 share/mysql/test/suite/innodb/t/upgrade_fts_aux.test
+share/mysql/test/suite/innodb/t/upgrade_fts_shared_tablespace.test
+share/mysql/test/suite/innodb/t/upgrade_geometry_56.test
+share/mysql/test/suite/innodb/t/upgrade_index_stats.test
 share/mysql/test/suite/innodb/t/upgrade_orphan.test
 share/mysql/test/suite/innodb/t/upgrade_partition.test
+share/mysql/test/suite/innodb/t/upgrade_unknown_directory.test
 share/mysql/test/suite/innodb/t/virtual_basic.test
 share/mysql/test/suite/innodb/t/virtual_blob.test
 share/mysql/test/suite/innodb/t/virtual_debug.test
@@ -8279,6 +9209,8 @@ share/mysql/test/suite/innodb/t/zlob_big_rollback.test
 share/mysql/test/suite/innodb/t/zlob_fragments.test
 share/mysql/test/suite/innodb/t/zlob_geom.test
 share/mysql/test/suite/innodb/t/zlob_ibd_size.test
+share/mysql/test/suite/innodb/t/zlob_ibd_size_replace.test
+share/mysql/test/suite/innodb/t/zlob_import_10mb.test
 share/mysql/test/suite/innodb/t/zlob_import_export.test
 share/mysql/test/suite/innodb/t/zlob_insert_by_update.test
 share/mysql/test/suite/innodb/t/zlob_long_partial_update.test
@@ -8342,6 +9274,7 @@ share/mysql/test/suite/innodb_fts/r/ngram_2.result
 share/mysql/test/suite/innodb_fts/r/ngram_debug.result
 share/mysql/test/suite/innodb_fts/r/opt.result
 share/mysql/test/suite/innodb_fts/r/phrase.result
+share/mysql/test/suite/innodb_fts/r/phrase_clear_no_match.result
 share/mysql/test/suite/innodb_fts/r/plugin.result
 share/mysql/test/suite/innodb_fts/r/plugin_1.result
 share/mysql/test/suite/innodb_fts/r/plugin_debug.result
@@ -8399,6 +9332,7 @@ share/mysql/test/suite/innodb_fts/t/ngram_2.test
 share/mysql/test/suite/innodb_fts/t/ngram_debug.test
 share/mysql/test/suite/innodb_fts/t/opt.test
 share/mysql/test/suite/innodb_fts/t/phrase.test
+share/mysql/test/suite/innodb_fts/t/phrase_clear_no_match.test
 share/mysql/test/suite/innodb_fts/t/plugin-master.opt
 share/mysql/test/suite/innodb_fts/t/plugin.test
 share/mysql/test/suite/innodb_fts/t/plugin_1-master.opt
@@ -8414,6 +9348,7 @@ share/mysql/test/suite/innodb_fts/t/sync-master.opt
 share/mysql/test/suite/innodb_fts/t/sync.test
 share/mysql/test/suite/innodb_fts/t/sync_block.test
 share/mysql/test/suite/innodb_fts/t/tablespace.test
+share/mysql/test/suite/innodb_fts/t/tablespace_location-master.opt
 share/mysql/test/suite/innodb_fts/t/tablespace_location.test
 share/mysql/test/suite/innodb_fts/t/tablespace_location_error.test
 share/mysql/test/suite/innodb_fts/t/transaction.test
@@ -8603,11 +9538,8 @@ share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-master.opt
 share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress-slave.opt
 share/mysql/test/suite/innodb_stress/t/innodb_stress_nocompress.test
 share/mysql/test/suite/innodb_stress/t/load_generator.py
-share/mysql/test/suite/innodb_stress/t/suite.opt
 share/mysql/test/suite/innodb_undo/include/i_s_files.inc
-share/mysql/test/suite/innodb_undo/include/truncate_recover_cleanup.inc
-share/mysql/test/suite/innodb_undo/include/truncate_recover_run.inc
-share/mysql/test/suite/innodb_undo/include/truncate_recover_setup.inc
+share/mysql/test/suite/innodb_undo/include/truncate_at_shutdown.inc
 share/mysql/test/suite/innodb_undo/include/undo_trunc_multi_client.inc
 share/mysql/test/suite/innodb_undo/r/encrypt_explicit.result
 share/mysql/test/suite/innodb_undo/r/i_s_files_16k.result
@@ -8628,14 +9560,25 @@ share/mysql/test/suite/innodb_undo/r/truncate_recover_06.result
 share/mysql/test/suite/innodb_undo/r/truncate_recover_07.result
 share/mysql/test/suite/innodb_undo/r/truncate_recover_08.result
 share/mysql/test/suite/innodb_undo/r/truncate_recover_09.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e01.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e02.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e03.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e04.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e05.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e06.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e07.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e08.result
+share/mysql/test/suite/innodb_undo/r/truncate_recover_e09.result
 share/mysql/test/suite/innodb_undo/r/truncate_xa.result
 share/mysql/test/suite/innodb_undo/r/undo_ddl_recover.result
 share/mysql/test/suite/innodb_undo/r/undo_ddl_vs_dml.result
+share/mysql/test/suite/innodb_undo/r/undo_directory.result
 share/mysql/test/suite/innodb_undo/r/undo_settings.result
 share/mysql/test/suite/innodb_undo/r/undo_tablespace.result
 share/mysql/test/suite/innodb_undo/r/undo_tablespace_125.result
 share/mysql/test/suite/innodb_undo/r/undo_tablespace_debug.result
 share/mysql/test/suite/innodb_undo/r/undo_tablespace_encrypt.result
+share/mysql/test/suite/innodb_undo/r/undo_tablespace_encrypt_rotate.result
 share/mysql/test/suite/innodb_undo/r/undo_tablespace_win.result
 share/mysql/test/suite/innodb_undo/t/encrypt_explicit.test
 share/mysql/test/suite/innodb_undo/t/i_s_files_16k-master.opt
@@ -8652,9 +9595,7 @@ share/mysql/test/suite/innodb_undo/t/trunc_multi_client_01-master.opt
 share/mysql/test/suite/innodb_undo/t/trunc_multi_client_01.test
 share/mysql/test/suite/innodb_undo/t/trunc_multi_client_02-master.opt
 share/mysql/test/suite/innodb_undo/t/trunc_multi_client_02.test
-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_explicit-master.opt
 share/mysql/test/suite/innodb_undo/t/truncate_explicit.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover_01.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover_02.test
@@ -8665,15 +9606,35 @@ share/mysql/test/suite/innodb_undo/t/truncate_recover_06.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover_07.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover_08.test
 share/mysql/test/suite/innodb_undo/t/truncate_recover_09.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e01-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e01.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e02-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e02.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e03-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e03.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e04-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e04.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e05-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e05.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e06-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e06.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e07-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e07.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e08-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e08.test
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e09-master.opt
+share/mysql/test/suite/innodb_undo/t/truncate_recover_e09.test
 share/mysql/test/suite/innodb_undo/t/truncate_xa.test
 share/mysql/test/suite/innodb_undo/t/undo_ddl_recover.test
 share/mysql/test/suite/innodb_undo/t/undo_ddl_vs_dml.test
+share/mysql/test/suite/innodb_undo/t/undo_directory.test
 share/mysql/test/suite/innodb_undo/t/undo_settings-master.opt
 share/mysql/test/suite/innodb_undo/t/undo_settings.test
 share/mysql/test/suite/innodb_undo/t/undo_tablespace.test
 share/mysql/test/suite/innodb_undo/t/undo_tablespace_125.test
 share/mysql/test/suite/innodb_undo/t/undo_tablespace_debug.test
 share/mysql/test/suite/innodb_undo/t/undo_tablespace_encrypt.test
+share/mysql/test/suite/innodb_undo/t/undo_tablespace_encrypt_rotate.test
 share/mysql/test/suite/innodb_undo/t/undo_tablespace_win.test
 share/mysql/test/suite/innodb_zip/include/atomic_truncate_table_crash_stripped.inc
 share/mysql/test/suite/innodb_zip/include/atomic_truncate_table_error.inc
@@ -8754,8 +9715,10 @@ share/mysql/test/suite/innodb_zip/t/transportable_tbsp_zip-master.opt
 share/mysql/test/suite/innodb_zip/t/transportable_tbsp_zip.test
 share/mysql/test/suite/innodb_zip/t/undo_log_tmp_table.test
 share/mysql/test/suite/innodb_zip/t/zip.test
+share/mysql/test/suite/interactive_utilities/r/mysql_config_editor.result
 share/mysql/test/suite/interactive_utilities/r/mysql_secure_installation.result
 share/mysql/test/suite/interactive_utilities/r/mysql_secure_installation_ssl.result
+share/mysql/test/suite/interactive_utilities/t/mysql_config_editor.test
 share/mysql/test/suite/interactive_utilities/t/mysql_secure_installation-master.opt
 share/mysql/test/suite/interactive_utilities/t/mysql_secure_installation.test
 share/mysql/test/suite/interactive_utilities/t/mysql_secure_installation_ssl-master.opt
@@ -9016,52 +9979,52 @@ share/mysql/test/suite/json/r/array_index.result
 share/mysql/test/suite/json/r/array_index_debug.result
 share/mysql/test/suite/json/r/json_agg.result
 share/mysql/test/suite/json/r/json_client_innodb.result
-share/mysql/test/suite/json/r/json_client_ndb.result
 share/mysql/test/suite/json/r/json_conversions.result
 share/mysql/test/suite/json/r/json_ddl_innodb.result
-share/mysql/test/suite/json/r/json_ddl_ndb.result
 share/mysql/test/suite/json/r/json_fulltext_innodb.result
 share/mysql/test/suite/json/r/json_functions_innodb.result
-share/mysql/test/suite/json/r/json_functions_ndb.result
 share/mysql/test/suite/json/r/json_gcol_innodb.result
 share/mysql/test/suite/json/r/json_group_concat_innodb.result
-share/mysql/test/suite/json/r/json_group_concat_ndb.result
 share/mysql/test/suite/json/r/json_innodb.result
 share/mysql/test/suite/json/r/json_insert_innodb.result
-share/mysql/test/suite/json/r/json_insert_ndb.result
 share/mysql/test/suite/json/r/json_no_table.result
 share/mysql/test/suite/json/r/json_perfschema.result
+share/mysql/test/suite/json/r/json_prep_stmts.result
 share/mysql/test/suite/json/r/json_schema.result
 share/mysql/test/suite/json/r/json_schema_validation_report.result
 share/mysql/test/suite/json/r/json_table.result
+share/mysql/test/suite/json/r/json_value.result
 share/mysql/test/suite/json/t/array_index-master.opt
 share/mysql/test/suite/json/t/array_index.test
 share/mysql/test/suite/json/t/array_index_debug.test
 share/mysql/test/suite/json/t/json_agg.test
 share/mysql/test/suite/json/t/json_client_innodb.test
-share/mysql/test/suite/json/t/json_client_ndb.cnf
-share/mysql/test/suite/json/t/json_client_ndb.test
 share/mysql/test/suite/json/t/json_conversions.test
 share/mysql/test/suite/json/t/json_ddl_innodb.test
-share/mysql/test/suite/json/t/json_ddl_ndb.cnf
-share/mysql/test/suite/json/t/json_ddl_ndb.test
 share/mysql/test/suite/json/t/json_fulltext_innodb.test
 share/mysql/test/suite/json/t/json_functions_innodb.test
-share/mysql/test/suite/json/t/json_functions_ndb.cnf
-share/mysql/test/suite/json/t/json_functions_ndb.test
 share/mysql/test/suite/json/t/json_gcol_innodb.test
 share/mysql/test/suite/json/t/json_group_concat_innodb.test
-share/mysql/test/suite/json/t/json_group_concat_ndb.cnf
-share/mysql/test/suite/json/t/json_group_concat_ndb.test
 share/mysql/test/suite/json/t/json_innodb.test
 share/mysql/test/suite/json/t/json_insert_innodb.test
-share/mysql/test/suite/json/t/json_insert_ndb.cnf
-share/mysql/test/suite/json/t/json_insert_ndb.test
 share/mysql/test/suite/json/t/json_no_table.test
 share/mysql/test/suite/json/t/json_perfschema.test
+share/mysql/test/suite/json/t/json_prep_stmts.test
 share/mysql/test/suite/json/t/json_schema.test
 share/mysql/test/suite/json/t/json_schema_validation_report.test
 share/mysql/test/suite/json/t/json_table.test
+share/mysql/test/suite/json/t/json_value.test
+share/mysql/test/suite/json_ndb/my.cnf
+share/mysql/test/suite/json_ndb/r/json_client_ndb.result
+share/mysql/test/suite/json_ndb/r/json_ddl_ndb.result
+share/mysql/test/suite/json_ndb/r/json_functions_ndb.result
+share/mysql/test/suite/json_ndb/r/json_group_concat_ndb.result
+share/mysql/test/suite/json_ndb/r/json_insert_ndb.result
+share/mysql/test/suite/json_ndb/t/json_client_ndb.test
+share/mysql/test/suite/json_ndb/t/json_ddl_ndb.test
+share/mysql/test/suite/json_ndb/t/json_functions_ndb.test
+share/mysql/test/suite/json_ndb/t/json_group_concat_ndb.test
+share/mysql/test/suite/json_ndb/t/json_insert_ndb.test
 share/mysql/test/suite/large_tests/README.TXT
 share/mysql/test/suite/large_tests/r/alter_table.result
 share/mysql/test/suite/large_tests/r/innodb_innochecksum_3gb.result
@@ -9127,6 +10090,7 @@ share/mysql/test/suite/memcached/include/create_sdi_index.inc
 share/mysql/test/suite/memcached/include/ibd2sdi_common.inc
 share/mysql/test/suite/memcached/include/load_daemon_memcached_expecting_error.inc
 share/mysql/test/suite/memcached/include/load_daemon_memcached_expecting_success.inc
+share/mysql/test/suite/memcached/include/run_memcached_multithreaded_test.inc
 share/mysql/test/suite/memcached/include/sdi_corrupt_table.inc
 share/mysql/test/suite/memcached/include/sdi_create_alter.inc
 share/mysql/test/suite/memcached/include/sdi_create_index.inc
@@ -9178,6 +10142,12 @@ share/mysql/test/suite/memcached/r/memc250_container.result
 share/mysql/test/suite/memcached/r/memc251_w_batch_6.result
 share/mysql/test/suite/memcached/r/memc252_empty_opts.result
 share/mysql/test/suite/memcached/r/memc253_empty_opts.result
+share/mysql/test/suite/memcached/r/memc254_multithreaded.result
+share/mysql/test/suite/memcached/r/memc255_change_containers_and_flush.result
+share/mysql/test/suite/memcached/r/memc256_lock_table_write.result
+share/mysql/test/suite/memcached/r/memc257_multithreaded_empty_keys.result
+share/mysql/test/suite/memcached/r/memc258_multithreaded_get_replace_flush.result
+share/mysql/test/suite/memcached/r/memc259_deprecated.result
 share/mysql/test/suite/memcached/r/memc261_container_errs.result
 share/mysql/test/suite/memcached/r/memc262_instant_add_column.result
 share/mysql/test/suite/memcached/r/memc263_r_batch_4.result
@@ -9302,6 +10272,18 @@ share/mysql/test/suite/memcached/t/memc252_empty_opts-master.opt
 share/mysql/test/suite/memcached/t/memc252_empty_opts.test
 share/mysql/test/suite/memcached/t/memc253_empty_opts-master.opt
 share/mysql/test/suite/memcached/t/memc253_empty_opts.test
+share/mysql/test/suite/memcached/t/memc254_multithreaded-master.opt
+share/mysql/test/suite/memcached/t/memc254_multithreaded.test
+share/mysql/test/suite/memcached/t/memc255_change_containers_and_flush-master.opt
+share/mysql/test/suite/memcached/t/memc255_change_containers_and_flush.test
+share/mysql/test/suite/memcached/t/memc256_lock_table_write-master.opt
+share/mysql/test/suite/memcached/t/memc256_lock_table_write.test
+share/mysql/test/suite/memcached/t/memc257_multithreaded_empty_keys-master.opt
+share/mysql/test/suite/memcached/t/memc257_multithreaded_empty_keys.test
+share/mysql/test/suite/memcached/t/memc258_multithreaded_get_replace_flush-master.opt
+share/mysql/test/suite/memcached/t/memc258_multithreaded_get_replace_flush.test
+share/mysql/test/suite/memcached/t/memc259_deprecated-master.opt
+share/mysql/test/suite/memcached/t/memc259_deprecated.test
 share/mysql/test/suite/memcached/t/memc261_container_errs-master.opt
 share/mysql/test/suite/memcached/t/memc261_container_errs.test
 share/mysql/test/suite/memcached/t/memc262_instant_add_column-master.opt
@@ -9447,6 +10429,54 @@ share/mysql/test/suite/ndb/backups/bug17275798/BACKUP-1.21.ctl
 share/mysql/test/suite/ndb/backups/bug17275798/BACKUP-1.21.log
 share/mysql/test/suite/ndb/backups/bug54613/BACKUP-2.2.ctl
 share/mysql/test/suite/ndb/backups/hashmap/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-1-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-2-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-3-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor/BACKUP-1-PART-4-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-1-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-2-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-3-OF-4/BACKUP-1.2.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1-0.1.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1-0.2.Data
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1.1.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1.1.log
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1.2.ctl
+share/mysql/test/suite/ndb/backups/metadata_upgrade_80_minor_fk/BACKUP-1-PART-4-OF-4/BACKUP-1.2.log
 share/mysql/test/suite/ndb/backups/metadata_upgrade_advanced_backup/BACKUP-1-0.1.Data
 share/mysql/test/suite/ndb/backups/metadata_upgrade_advanced_backup/BACKUP-1-0.2.Data
 share/mysql/test/suite/ndb/backups/metadata_upgrade_advanced_backup/BACKUP-1.1.ctl
@@ -9550,24 +10580,24 @@ share/mysql/test/suite/ndb/include/ndb_add_node.cnf
 share/mysql/test/suite/ndb/include/ndb_add_node_mysqld.cnf
 share/mysql/test/suite/ndb/include/ndb_addnode_restart_setup.inc
 share/mysql/test/suite/ndb/include/ndb_check_blob_tables.inc
+share/mysql/test/suite/ndb/include/ndb_check_file_contains.inc
 share/mysql/test/suite/ndb/include/ndb_check_unique_index.inc
 share/mysql/test/suite/ndb/include/ndb_desc_print.inc
+share/mysql/test/suite/ndb/include/ndb_diff_api_counts.inc
 share/mysql/test/suite/ndb/include/ndb_diff_tables.inc
 share/mysql/test/suite/ndb/include/ndb_error_reporter.inc
 share/mysql/test/suite/ndb/include/ndb_exec.inc
 share/mysql/test/suite/ndb/include/ndb_execute_count.inc
-share/mysql/test/suite/ndb/include/ndb_find_import_tool.inc
-share/mysql/test/suite/ndb/include/ndb_find_index_stat_tool.inc
-share/mysql/test/suite/ndb/include/ndb_find_ndb_perror.inc
-share/mysql/test/suite/ndb/include/ndb_find_print_file_tool.inc
-share/mysql/test/suite/ndb/include/ndb_find_tools.inc
 share/mysql/test/suite/ndb/include/ndb_get_blob_tables.inc
+share/mysql/test/suite/ndb/include/ndb_index_stat_wait.inc
 share/mysql/test/suite/ndb/include/ndb_info.inc
+share/mysql/test/suite/ndb/include/ndb_init_api_counts.inc
 share/mysql/test/suite/ndb/include/ndb_init_execute_count.inc
 share/mysql/test/suite/ndb/include/ndb_init_scan_counts.inc
 share/mysql/test/suite/ndb/include/ndb_restore_check_warn.inc
 share/mysql/test/suite/ndb/include/ndb_scan_counts.inc
 share/mysql/test/suite/ndb/include/ndb_share_check_shares.inc
+share/mysql/test/suite/ndb/include/ndb_sync_metadata.inc
 share/mysql/test/suite/ndb/include/restart_cluster.inc
 share/mysql/test/suite/ndb/include/restart_cluster_rolling.inc
 share/mysql/test/suite/ndb/include/restart_node.inc
@@ -9576,17 +10606,21 @@ share/mysql/test/suite/ndb/include/restore_ndb_read_backup.inc
 share/mysql/test/suite/ndb/include/restore_sql_mode_after_turn_off_strict.inc
 share/mysql/test/suite/ndb/include/run_java.inc
 share/mysql/test/suite/ndb/include/run_ndbapitest.inc
-share/mysql/test/suite/ndb/include/start_mysqld.inc
-share/mysql/test/suite/ndb/include/stop_mysqld.inc
 share/mysql/test/suite/ndb/include/turn_off_ndb_read_backup.inc
 share/mysql/test/suite/ndb/include/turn_off_strict_sql_mode.inc
 share/mysql/test/suite/ndb/my.cnf
+share/mysql/test/suite/ndb/my_3rpl.cnf
+share/mysql/test/suite/ndb/my_4rpl.cnf
 share/mysql/test/suite/ndb/ndb_config_config.ini
 share/mysql/test/suite/ndb/ndb_config_mycnf1.cnf
 share/mysql/test/suite/ndb/ndb_config_mycnf2.cnf
 share/mysql/test/suite/ndb/ndb_config_threadconfig.ini
+share/mysql/test/suite/ndb/ndbfs_files/7.6.15/DBDIH/P0.sysfile
+share/mysql/test/suite/ndb/ndbfs_files/8.0.17/DBDIH/P0.sysfile
+share/mysql/test/suite/ndb/ndbfs_files/8.0.21/DBDIH/P0.sysfile
+share/mysql/test/suite/ndb/ndbfs_files/8.0.22/DBDIH/P0.sysfile
 share/mysql/test/suite/ndb/r/apply_stored_grants.result
-share/mysql/test/suite/ndb/r/bug24926009.result
+share/mysql/test/suite/ndb/r/backup_passwords.result
 share/mysql/test/suite/ndb/r/bug36547.result
 share/mysql/test/suite/ndb/r/clusterj.result
 share/mysql/test/suite/ndb/r/concurrent_grants.result
@@ -9604,11 +10638,13 @@ share/mysql/test/suite/ndb/r/ndb_alter_table2.result
 share/mysql/test/suite/ndb/r/ndb_alter_table3.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_backup.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_column_online.result
+share/mysql/test/suite/ndb/r/ndb_alter_table_comment.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_dml.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_error.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_online.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_online2.result
 share/mysql/test/suite/ndb/r/ndb_alter_table_online_multi.result
+share/mysql/test/suite/ndb/r/ndb_api_buffer.result
 share/mysql/test/suite/ndb/r/ndb_auto_increment.result
 share/mysql/test/suite/ndb/r/ndb_autoinc.result
 share/mysql/test/suite/ndb/r/ndb_backup_alter.result
@@ -9617,13 +10653,19 @@ share/mysql/test/suite/ndb/r/ndb_backup_nodefail.result
 share/mysql/test/suite/ndb/r/ndb_backup_print.result
 share/mysql/test/suite/ndb/r/ndb_backup_rate.result
 share/mysql/test/suite/ndb/r/ndb_basic.result
+share/mysql/test/suite/ndb/r/ndb_basic_3rpl.result
+share/mysql/test/suite/ndb/r/ndb_basic_4rpl.result
 share/mysql/test/suite/ndb/r/ndb_basic_ndbd.result
 share/mysql/test/suite/ndb/r/ndb_big_row.result
 share/mysql/test/suite/ndb/r/ndb_big_signals.result
+share/mysql/test/suite/ndb/r/ndb_big_table.result
 share/mysql/test/suite/ndb/r/ndb_bitfield.result
 share/mysql/test/suite/ndb/r/ndb_blob.result
+share/mysql/test/suite/ndb/r/ndb_blob_batching.result
 share/mysql/test/suite/ndb/r/ndb_blob_big.result
+share/mysql/test/suite/ndb/r/ndb_blob_corrupt.result
 share/mysql/test/suite/ndb/r/ndb_blob_partition.result
+share/mysql/test/suite/ndb/r/ndb_block_ddl_during_upgrade.result
 share/mysql/test/suite/ndb/r/ndb_bug13563280.result
 share/mysql/test/suite/ndb/r/ndb_bug14166590.result
 share/mysql/test/suite/ndb/r/ndb_bug17624736.result
@@ -9634,14 +10676,12 @@ share/mysql/test/suite/ndb/r/ndb_bug22904640.result
 share/mysql/test/suite/ndb/r/ndb_bug24444878.result
 share/mysql/test/suite/ndb/r/ndb_bug26793.result
 share/mysql/test/suite/ndb/r/ndb_bug30573733.result
+share/mysql/test/suite/ndb/r/ndb_bug30708263.result
 share/mysql/test/suite/ndb/r/ndb_bug31477.result
 share/mysql/test/suite/ndb/r/ndb_bulk_delete.result
-share/mysql/test/suite/ndb/r/ndb_bushy_joins.result
-share/mysql/test/suite/ndb/r/ndb_charset.result
 share/mysql/test/suite/ndb/r/ndb_checksum.result
 share/mysql/test/suite/ndb/r/ndb_column_properties.result
 share/mysql/test/suite/ndb/r/ndb_column_properties_compat.result
-share/mysql/test/suite/ndb/r/ndb_condition_pushdown.result
 share/mysql/test/suite/ndb/r/ndb_config.result
 share/mysql/test/suite/ndb/r/ndb_config2.result
 share/mysql/test/suite/ndb/r/ndb_connection_pool_nodeids.result
@@ -9672,8 +10712,10 @@ share/mysql/test/suite/ndb/r/ndb_delete_disconnect.result
 share/mysql/test/suite/ndb/r/ndb_deprecated_config.result
 share/mysql/test/suite/ndb/r/ndb_deprecated_config_with_tm.result
 share/mysql/test/suite/ndb/r/ndb_desc_blob.result
+share/mysql/test/suite/ndb/r/ndb_desc_extra.result
 share/mysql/test/suite/ndb/r/ndb_disconnect.result
 share/mysql/test/suite/ndb/r/ndb_discover_db.result
+share/mysql/test/suite/ndb/r/ndb_encrypted_backup.result
 share/mysql/test/suite/ndb/r/ndb_endian.result
 share/mysql/test/suite/ndb/r/ndb_err4012.result
 share/mysql/test/suite/ndb/r/ndb_err899.result
@@ -9694,7 +10736,6 @@ share/mysql/test/suite/ndb/r/ndb_fk_db.result
 share/mysql/test/suite/ndb/r/ndb_fk_deferred_cascade.result
 share/mysql/test/suite/ndb/r/ndb_fk_disable.result
 share/mysql/test/suite/ndb/r/ndb_fk_is.result
-share/mysql/test/suite/ndb/r/ndb_fk_locase.result
 share/mysql/test/suite/ndb/r/ndb_fk_locking.result
 share/mysql/test/suite/ndb/r/ndb_fk_multi_column.result
 share/mysql/test/suite/ndb/r/ndb_fk_mysqldump.result
@@ -9725,22 +10766,17 @@ share/mysql/test/suite/ndb/r/ndb_global_schema_lock.result
 share/mysql/test/suite/ndb/r/ndb_global_schema_lock_error.result
 share/mysql/test/suite/ndb/r/ndb_grant.result
 share/mysql/test/suite/ndb/r/ndb_gsl_ddl_kill.result
+share/mysql/test/suite/ndb/r/ndb_gsl_mdl_deadlock.result
 share/mysql/test/suite/ndb/r/ndb_hashmap.result
 share/mysql/test/suite/ndb/r/ndb_hidden_pk.result
 share/mysql/test/suite/ndb/r/ndb_import0.result
 share/mysql/test/suite/ndb/r/ndb_import1.result
 share/mysql/test/suite/ndb/r/ndb_import2.result
 share/mysql/test/suite/ndb/r/ndb_index.result
+share/mysql/test/suite/ndb/r/ndb_index_name_format.result
 share/mysql/test/suite/ndb/r/ndb_index_ordered.result
-share/mysql/test/suite/ndb/r/ndb_index_stat.result
-share/mysql/test/suite/ndb/r/ndb_index_stat_partitions.result
-share/mysql/test/suite/ndb/r/ndb_index_stat_restart.result
 share/mysql/test/suite/ndb/r/ndb_index_unique.result
 share/mysql/test/suite/ndb/r/ndb_insert.result
-share/mysql/test/suite/ndb/r/ndb_join_pushdown_bka.result
-share/mysql/test/suite/ndb/r/ndb_join_pushdown_default.result
-share/mysql/test/suite/ndb/r/ndb_join_pushdown_nobnl.result
-share/mysql/test/suite/ndb/r/ndb_join_pushdown_none.result
 share/mysql/test/suite/ndb/r/ndb_large_metadata.result
 share/mysql/test/suite/ndb/r/ndb_limit.result
 share/mysql/test/suite/ndb/r/ndb_limit_deferred_triggers.result
@@ -9750,6 +10786,9 @@ share/mysql/test/suite/ndb/r/ndb_loaddatalocal.result
 share/mysql/test/suite/ndb/r/ndb_lock.result
 share/mysql/test/suite/ndb/r/ndb_lock_table.result
 share/mysql/test/suite/ndb/r/ndb_many_fragments.result
+share/mysql/test/suite/ndb/r/ndb_metadata_check.result
+share/mysql/test/suite/ndb/r/ndb_metadata_upgrade_80_minor.result
+share/mysql/test/suite/ndb/r/ndb_metadata_upgrade_80_minor_fk.result
 share/mysql/test/suite/ndb/r/ndb_metadata_upgrade_advanced.result
 share/mysql/test/suite/ndb/r/ndb_metadata_upgrade_basic.result
 share/mysql/test/suite/ndb/r/ndb_metadata_upgrade_fk.result
@@ -9777,11 +10816,12 @@ share/mysql/test/suite/ndb/r/ndb_partition_key.result
 share/mysql/test/suite/ndb/r/ndb_partition_list.result
 share/mysql/test/suite/ndb/r/ndb_partition_range.result
 share/mysql/test/suite/ndb/r/ndb_perror.result
+share/mysql/test/suite/ndb/r/ndb_pfs_tables.result
 share/mysql/test/suite/ndb/r/ndb_print_backup_file.result
 share/mysql/test/suite/ndb/r/ndb_print_file.result
+share/mysql/test/suite/ndb/r/ndb_print_sys_file.result
 share/mysql/test/suite/ndb/r/ndb_rb_fragment_count.result
 share/mysql/test/suite/ndb/r/ndb_rb_fragment_count_desc.result
-share/mysql/test/suite/ndb/r/ndb_rbwr.result
 share/mysql/test/suite/ndb/r/ndb_read_balance.result
 share/mysql/test/suite/ndb/r/ndb_read_local.result
 share/mysql/test/suite/ndb/r/ndb_read_location_domain.result
@@ -9803,7 +10843,18 @@ share/mysql/test/suite/ndb/r/ndb_restore_conv_lossy_charbinary.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_lossy_integral.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_more.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_padding.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_pk_auto.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_pk_basic.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_pk_blob.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_pk_negative.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_pk_slice_remap.result
 share/mysql/test/suite/ndb/r/ndb_restore_conv_promotion.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_remap.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_remap_auto.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_remap_basic.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_remap_debug.result
+share/mysql/test/suite/ndb/r/ndb_restore_conv_remap_negative.result
+share/mysql/test/suite/ndb/r/ndb_restore_debug.result
 share/mysql/test/suite/ndb/r/ndb_restore_discover.result
 share/mysql/test/suite/ndb/r/ndb_restore_gcp.result
 share/mysql/test/suite/ndb/r/ndb_restore_indexbuild.result
@@ -9815,6 +10866,7 @@ share/mysql/test/suite/ndb/r/ndb_restore_schema_partitions.result
 share/mysql/test/suite/ndb/r/ndb_restore_schema_rewrites.result
 share/mysql/test/suite/ndb/r/ndb_restore_schema_subsets.result
 share/mysql/test/suite/ndb/r/ndb_restore_schema_tolerance.result
+share/mysql/test/suite/ndb/r/ndb_restore_slice.result
 share/mysql/test/suite/ndb/r/ndb_row_count.result
 share/mysql/test/suite/ndb/r/ndb_row_format.result
 share/mysql/test/suite/ndb/r/ndb_schema_sync_missing_tablespace.result
@@ -9825,16 +10877,11 @@ share/mysql/test/suite/ndb/r/ndb_short_sigs.result
 share/mysql/test/suite/ndb/r/ndb_show_tables.result
 share/mysql/test/suite/ndb/r/ndb_single_user.result
 share/mysql/test/suite/ndb/r/ndb_sp.result
-share/mysql/test/suite/ndb/r/ndb_spj_dict.result
-share/mysql/test/suite/ndb/r/ndb_spj_skew.result
 share/mysql/test/suite/ndb/r/ndb_sql_allow_batching.result
 share/mysql/test/suite/ndb/r/ndb_st_backup.result
 share/mysql/test/suite/ndb/r/ndb_startup.result
-share/mysql/test/suite/ndb/r/ndb_statistics0.result
-share/mysql/test/suite/ndb/r/ndb_statistics1.result
 share/mysql/test/suite/ndb/r/ndb_stop_on_error.result
 share/mysql/test/suite/ndb/r/ndb_storage.result
-share/mysql/test/suite/ndb/r/ndb_subquery.result
 share/mysql/test/suite/ndb/r/ndb_suma_handover.result
 share/mysql/test/suite/ndb/r/ndb_table_encryption.result
 share/mysql/test/suite/ndb/r/ndb_tctakeover.result
@@ -9844,10 +10891,12 @@ share/mysql/test/suite/ndb/r/ndb_tools_connect.result
 share/mysql/test/suite/ndb/r/ndb_transaction.result
 share/mysql/test/suite/ndb/r/ndb_transaction_max_size.result
 share/mysql/test/suite/ndb/r/ndb_transaction_memory_shortage.result
+share/mysql/test/suite/ndb/r/ndb_transaction_memory_shortage_dbacc.result
 share/mysql/test/suite/ndb/r/ndb_trigger.result
 share/mysql/test/suite/ndb/r/ndb_truncate.result
 share/mysql/test/suite/ndb/r/ndb_truncate_nologging.result
 share/mysql/test/suite/ndb/r/ndb_types.result
+share/mysql/test/suite/ndb/r/ndb_upd_del_single_to_multi.result
 share/mysql/test/suite/ndb/r/ndb_update.result
 share/mysql/test/suite/ndb/r/ndb_update_no_read.result
 share/mysql/test/suite/ndb/r/ndb_view.result
@@ -9863,19 +10912,22 @@ share/mysql/test/suite/ndb/r/ndbinfo_cluster_locks.result
 share/mysql/test/suite/ndb/r/ndbinfo_cpustat.result
 share/mysql/test/suite/ndb/r/ndbinfo_dump.result
 share/mysql/test/suite/ndb/r/ndbinfo_locks_per_fragment.result
+share/mysql/test/suite/ndb/r/ndbinfo_no_upgrade.result
 share/mysql/test/suite/ndb/r/ndbinfo_server_locks.result
 share/mysql/test/suite/ndb/r/ndbinfo_tables.result
 share/mysql/test/suite/ndb/r/ndbinfo_upgrade.result
+share/mysql/test/suite/ndb/r/nodegroup_1_2_1_2.result
 share/mysql/test/suite/ndb/r/ps_7ndb.result
+share/mysql/test/suite/ndb/r/stored_grants_binlog_setup.result
 share/mysql/test/suite/ndb/r/stored_grants_error_handling.result
+share/mysql/test/suite/ndb/r/stored_grants_val_pass.result
 share/mysql/test/suite/ndb/r/strict_autoinc_5ndb.result
 share/mysql/test/suite/ndb/r/test_debugger.result
 share/mysql/test/suite/ndb/r/test_mgm.result
 share/mysql/test/suite/ndb/r/test_mgmd.result
 share/mysql/test/suite/ndb/r/test_ndbinfo.result
 share/mysql/test/suite/ndb/t/apply_stored_grants.test
-share/mysql/test/suite/ndb/t/bug24926009.cnf
-share/mysql/test/suite/ndb/t/bug24926009.test
+share/mysql/test/suite/ndb/t/backup_passwords.test
 share/mysql/test/suite/ndb/t/bug36547.test
 share/mysql/test/suite/ndb/t/clusterj.cnf
 share/mysql/test/suite/ndb/t/clusterj.test
@@ -9905,19 +10957,20 @@ share/mysql/test/suite/ndb/t/ndb_alter_table_backup.cnf
 share/mysql/test/suite/ndb/t/ndb_alter_table_backup.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_column_online.cnf
 share/mysql/test/suite/ndb/t/ndb_alter_table_column_online.test
+share/mysql/test/suite/ndb/t/ndb_alter_table_comment.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_dml.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_error.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_online.cnf
 share/mysql/test/suite/ndb/t/ndb_alter_table_online.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_online2.test
 share/mysql/test/suite/ndb/t/ndb_alter_table_online_multi.test
+share/mysql/test/suite/ndb/t/ndb_api_buffer.test
 share/mysql/test/suite/ndb/t/ndb_auto_increment.test
 share/mysql/test/suite/ndb/t/ndb_autoinc.test
 share/mysql/test/suite/ndb/t/ndb_backup_alter.test
 share/mysql/test/suite/ndb/t/ndb_backup_log.test
 share/mysql/test/suite/ndb/t/ndb_backup_nodefail.cnf
 share/mysql/test/suite/ndb/t/ndb_backup_nodefail.test
-share/mysql/test/suite/ndb/t/ndb_backup_nowait_snapshotstart_start.inc
 share/mysql/test/suite/ndb/t/ndb_backup_nowait_start.inc
 share/mysql/test/suite/ndb/t/ndb_backup_nowait_wait.inc
 share/mysql/test/suite/ndb/t/ndb_backup_print.test
@@ -9925,16 +10978,25 @@ share/mysql/test/suite/ndb/t/ndb_backup_rate.cnf
 share/mysql/test/suite/ndb/t/ndb_backup_rate.test
 share/mysql/test/suite/ndb/t/ndb_backup_restore.inc
 share/mysql/test/suite/ndb/t/ndb_basic.test
+share/mysql/test/suite/ndb/t/ndb_basic_3rpl.cnf
+share/mysql/test/suite/ndb/t/ndb_basic_3rpl.test
+share/mysql/test/suite/ndb/t/ndb_basic_4rpl.cnf
+share/mysql/test/suite/ndb/t/ndb_basic_4rpl.test
 share/mysql/test/suite/ndb/t/ndb_basic_ndbd.cnf
 share/mysql/test/suite/ndb/t/ndb_basic_ndbd.test
 share/mysql/test/suite/ndb/t/ndb_big_row.test
 share/mysql/test/suite/ndb/t/ndb_big_signals.test
+share/mysql/test/suite/ndb/t/ndb_big_table.test
 share/mysql/test/suite/ndb/t/ndb_bitfield.test
 share/mysql/test/suite/ndb/t/ndb_blob.cnf
 share/mysql/test/suite/ndb/t/ndb_blob.test
+share/mysql/test/suite/ndb/t/ndb_blob_batching.test
 share/mysql/test/suite/ndb/t/ndb_blob_big.cnf
 share/mysql/test/suite/ndb/t/ndb_blob_big.test
+share/mysql/test/suite/ndb/t/ndb_blob_corrupt.test
+share/mysql/test/suite/ndb/t/ndb_blob_helper.inc
 share/mysql/test/suite/ndb/t/ndb_blob_partition.test
+share/mysql/test/suite/ndb/t/ndb_block_ddl_during_upgrade.test
 share/mysql/test/suite/ndb/t/ndb_bug13563280.test
 share/mysql/test/suite/ndb/t/ndb_bug14166590.cnf
 share/mysql/test/suite/ndb/t/ndb_bug14166590.test
@@ -9949,17 +11011,14 @@ share/mysql/test/suite/ndb/t/ndb_bug22904640.test
 share/mysql/test/suite/ndb/t/ndb_bug24444878.test
 share/mysql/test/suite/ndb/t/ndb_bug26793.test
 share/mysql/test/suite/ndb/t/ndb_bug30573733.test
+share/mysql/test/suite/ndb/t/ndb_bug30708263.test
 share/mysql/test/suite/ndb/t/ndb_bug31477.test
 share/mysql/test/suite/ndb/t/ndb_bulk_delete.test
-share/mysql/test/suite/ndb/t/ndb_bushy_joins.cnf
-share/mysql/test/suite/ndb/t/ndb_bushy_joins.test
-share/mysql/test/suite/ndb/t/ndb_charset.test
 share/mysql/test/suite/ndb/t/ndb_checksum.cnf
 share/mysql/test/suite/ndb/t/ndb_checksum.test
 share/mysql/test/suite/ndb/t/ndb_column_properties.test
 share/mysql/test/suite/ndb/t/ndb_column_properties_compat.cnf
 share/mysql/test/suite/ndb/t/ndb_column_properties_compat.test
-share/mysql/test/suite/ndb/t/ndb_condition_pushdown.test
 share/mysql/test/suite/ndb/t/ndb_config.test
 share/mysql/test/suite/ndb/t/ndb_config2.test
 share/mysql/test/suite/ndb/t/ndb_connection_pool_nodeids.test
@@ -10000,11 +11059,13 @@ share/mysql/test/suite/ndb/t/ndb_deprecated_config_with_tm.cnf
 share/mysql/test/suite/ndb/t/ndb_deprecated_config_with_tm.ini
 share/mysql/test/suite/ndb/t/ndb_deprecated_config_with_tm.test
 share/mysql/test/suite/ndb/t/ndb_desc_blob.test
+share/mysql/test/suite/ndb/t/ndb_desc_extra.test
 share/mysql/test/suite/ndb/t/ndb_desc_show_partition_info.inc
 share/mysql/test/suite/ndb/t/ndb_disable_trans_timeout.inc
 share/mysql/test/suite/ndb/t/ndb_disconnect.test
 share/mysql/test/suite/ndb/t/ndb_discover_db.test
 share/mysql/test/suite/ndb/t/ndb_enable_trans_timeout.inc
+share/mysql/test/suite/ndb/t/ndb_encrypted_backup.test
 share/mysql/test/suite/ndb/t/ndb_endian.test
 share/mysql/test/suite/ndb/t/ndb_err4012.cnf
 share/mysql/test/suite/ndb/t/ndb_err4012.test
@@ -10030,8 +11091,6 @@ share/mysql/test/suite/ndb/t/ndb_fk_deferred_cascade.test
 share/mysql/test/suite/ndb/t/ndb_fk_disable.test
 share/mysql/test/suite/ndb/t/ndb_fk_is.inc
 share/mysql/test/suite/ndb/t/ndb_fk_is.test
-share/mysql/test/suite/ndb/t/ndb_fk_locase-master.opt
-share/mysql/test/suite/ndb/t/ndb_fk_locase.test
 share/mysql/test/suite/ndb/t/ndb_fk_locking.test
 share/mysql/test/suite/ndb/t/ndb_fk_multi_column.test
 share/mysql/test/suite/ndb/t/ndb_fk_mysqldump.test
@@ -10078,6 +11137,7 @@ share/mysql/test/suite/ndb/t/ndb_global_schema_lock.test
 share/mysql/test/suite/ndb/t/ndb_global_schema_lock_error.test
 share/mysql/test/suite/ndb/t/ndb_grant.later
 share/mysql/test/suite/ndb/t/ndb_gsl_ddl_kill.test
+share/mysql/test/suite/ndb/t/ndb_gsl_mdl_deadlock.test
 share/mysql/test/suite/ndb/t/ndb_hashmap.cnf
 share/mysql/test/suite/ndb/t/ndb_hashmap.test
 share/mysql/test/suite/ndb/t/ndb_hidden_pk.test
@@ -10087,19 +11147,11 @@ share/mysql/test/suite/ndb/t/ndb_import1.test
 share/mysql/test/suite/ndb/t/ndb_import2.cnf
 share/mysql/test/suite/ndb/t/ndb_import2.test
 share/mysql/test/suite/ndb/t/ndb_index.test
+share/mysql/test/suite/ndb/t/ndb_index_name_format.test
 share/mysql/test/suite/ndb/t/ndb_index_ordered.test
-share/mysql/test/suite/ndb/t/ndb_index_stat.test
-share/mysql/test/suite/ndb/t/ndb_index_stat_enable.inc
-share/mysql/test/suite/ndb/t/ndb_index_stat_partitions.test
-share/mysql/test/suite/ndb/t/ndb_index_stat_restart.test
 share/mysql/test/suite/ndb/t/ndb_index_unique.test
 share/mysql/test/suite/ndb/t/ndb_init_schema_locks_count.inc
 share/mysql/test/suite/ndb/t/ndb_insert.test
-share/mysql/test/suite/ndb/t/ndb_join_pushdown.inc
-share/mysql/test/suite/ndb/t/ndb_join_pushdown_bka.test
-share/mysql/test/suite/ndb/t/ndb_join_pushdown_default.test
-share/mysql/test/suite/ndb/t/ndb_join_pushdown_nobnl.test
-share/mysql/test/suite/ndb/t/ndb_join_pushdown_none.test
 share/mysql/test/suite/ndb/t/ndb_large_metadata.test
 share/mysql/test/suite/ndb/t/ndb_limit.test
 share/mysql/test/suite/ndb/t/ndb_limit_deferred_triggers.cnf
@@ -10113,6 +11165,10 @@ share/mysql/test/suite/ndb/t/ndb_lock.test
 share/mysql/test/suite/ndb/t/ndb_lock_table.test
 share/mysql/test/suite/ndb/t/ndb_many_fragments.cnf
 share/mysql/test/suite/ndb/t/ndb_many_fragments.test
+share/mysql/test/suite/ndb/t/ndb_metadata_check.test
+share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_80_minor.test
+share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_80_minor_fk.cnf
+share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_80_minor_fk.test
 share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_advanced.cnf
 share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_advanced.test
 share/mysql/test/suite/ndb/t/ndb_metadata_upgrade_basic.cnf
@@ -10132,6 +11188,7 @@ share/mysql/test/suite/ndb/t/ndb_mt_backup.cnf
 share/mysql/test/suite/ndb/t/ndb_mt_backup.test
 share/mysql/test/suite/ndb/t/ndb_mt_backup_ldms.cnf
 share/mysql/test/suite/ndb/t/ndb_mt_backup_ldms.test
+share/mysql/test/suite/ndb/t/ndb_mt_backup_parts.cnf
 share/mysql/test/suite/ndb/t/ndb_mt_backup_parts.test
 share/mysql/test/suite/ndb/t/ndb_multi.test
 share/mysql/test/suite/ndb/t/ndb_multi_row.test
@@ -10153,13 +11210,14 @@ share/mysql/test/suite/ndb/t/ndb_partition_key.test
 share/mysql/test/suite/ndb/t/ndb_partition_list.test
 share/mysql/test/suite/ndb/t/ndb_partition_range.test
 share/mysql/test/suite/ndb/t/ndb_perror.test
+share/mysql/test/suite/ndb/t/ndb_pfs_tables.test
 share/mysql/test/suite/ndb/t/ndb_print_backup_file.test
 share/mysql/test/suite/ndb/t/ndb_print_file.test
+share/mysql/test/suite/ndb/t/ndb_print_sys_file.cnf
+share/mysql/test/suite/ndb/t/ndb_print_sys_file.test
 share/mysql/test/suite/ndb/t/ndb_rb_fragment_count.cnf
 share/mysql/test/suite/ndb/t/ndb_rb_fragment_count.test
 share/mysql/test/suite/ndb/t/ndb_rb_fragment_count_desc.test
-share/mysql/test/suite/ndb/t/ndb_rbwr.inc
-share/mysql/test/suite/ndb/t/ndb_rbwr.test
 share/mysql/test/suite/ndb/t/ndb_read_balance.inc
 share/mysql/test/suite/ndb/t/ndb_read_balance.test
 share/mysql/test/suite/ndb/t/ndb_read_local.cnf
@@ -10178,6 +11236,7 @@ share/mysql/test/suite/ndb/t/ndb_restart_nostart.inc
 share/mysql/test/suite/ndb/t/ndb_restart_start.inc
 share/mysql/test/suite/ndb/t/ndb_restore_autoinc.test
 share/mysql/test/suite/ndb/t/ndb_restore_autoinc_debug.test
+share/mysql/test/suite/ndb/t/ndb_restore_bug17916243.cnf
 share/mysql/test/suite/ndb/t/ndb_restore_bug17916243.test
 share/mysql/test/suite/ndb/t/ndb_restore_compat_compression.test
 share/mysql/test/suite/ndb/t/ndb_restore_compat_downward.cnf
@@ -10187,9 +11246,21 @@ share/mysql/test/suite/ndb/t/ndb_restore_compat_partitioning.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_binary.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_lossy_charbinary.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_lossy_integral.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_more.cnf
 share/mysql/test/suite/ndb/t/ndb_restore_conv_more.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_padding.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_pk_auto.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_pk_basic.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_pk_blob.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_pk_negative.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_pk_slice_remap.test
 share/mysql/test/suite/ndb/t/ndb_restore_conv_promotion.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_remap.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_remap_auto.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_remap_basic.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_remap_debug.test
+share/mysql/test/suite/ndb/t/ndb_restore_conv_remap_negative.test
+share/mysql/test/suite/ndb/t/ndb_restore_debug.test
 share/mysql/test/suite/ndb/t/ndb_restore_discover.test
 share/mysql/test/suite/ndb/t/ndb_restore_indexbuild.cnf
 share/mysql/test/suite/ndb/t/ndb_restore_indexbuild.test
@@ -10204,6 +11275,7 @@ share/mysql/test/suite/ndb/t/ndb_restore_schema_rewrites.test
 share/mysql/test/suite/ndb/t/ndb_restore_schema_subsets.test
 share/mysql/test/suite/ndb/t/ndb_restore_schema_tolerance.cnf
 share/mysql/test/suite/ndb/t/ndb_restore_schema_tolerance.test
+share/mysql/test/suite/ndb/t/ndb_restore_slice.test
 share/mysql/test/suite/ndb/t/ndb_row_count.test
 share/mysql/test/suite/ndb/t/ndb_row_format.test
 share/mysql/test/suite/ndb/t/ndb_schema_locks_count.inc
@@ -10216,23 +11288,16 @@ share/mysql/test/suite/ndb/t/ndb_share.test
 share/mysql/test/suite/ndb/t/ndb_short_sigs.cnf
 share/mysql/test/suite/ndb/t/ndb_short_sigs.test
 share/mysql/test/suite/ndb/t/ndb_show_tables.test
-share/mysql/test/suite/ndb/t/ndb_show_tables_result.inc
 share/mysql/test/suite/ndb/t/ndb_single_user.cnf
 share/mysql/test/suite/ndb/t/ndb_single_user.test
 share/mysql/test/suite/ndb/t/ndb_sp.test
-share/mysql/test/suite/ndb/t/ndb_spj_dict.test
-share/mysql/test/suite/ndb/t/ndb_spj_skew.test
 share/mysql/test/suite/ndb/t/ndb_sql_allow_batching.test
 share/mysql/test/suite/ndb/t/ndb_st_backup.cnf
 share/mysql/test/suite/ndb/t/ndb_st_backup.test
 share/mysql/test/suite/ndb/t/ndb_startup.test
-share/mysql/test/suite/ndb/t/ndb_statistics.inc
-share/mysql/test/suite/ndb/t/ndb_statistics0.test
-share/mysql/test/suite/ndb/t/ndb_statistics1.test
 share/mysql/test/suite/ndb/t/ndb_stop_on_error.cnf
 share/mysql/test/suite/ndb/t/ndb_stop_on_error.test
 share/mysql/test/suite/ndb/t/ndb_storage.test
-share/mysql/test/suite/ndb/t/ndb_subquery.test
 share/mysql/test/suite/ndb/t/ndb_suma_handover.cnf
 share/mysql/test/suite/ndb/t/ndb_suma_handover.test
 share/mysql/test/suite/ndb/t/ndb_table_encryption.test
@@ -10247,11 +11312,14 @@ share/mysql/test/suite/ndb/t/ndb_transaction_max_size.test
 share/mysql/test/suite/ndb/t/ndb_transaction_memory_shortage.cnf
 share/mysql/test/suite/ndb/t/ndb_transaction_memory_shortage.inc
 share/mysql/test/suite/ndb/t/ndb_transaction_memory_shortage.test
+share/mysql/test/suite/ndb/t/ndb_transaction_memory_shortage_dbacc.cnf
+share/mysql/test/suite/ndb/t/ndb_transaction_memory_shortage_dbacc.test
 share/mysql/test/suite/ndb/t/ndb_trigger.test
 share/mysql/test/suite/ndb/t/ndb_truncate.test
 share/mysql/test/suite/ndb/t/ndb_truncate_nologging.cnf
 share/mysql/test/suite/ndb/t/ndb_truncate_nologging.test
 share/mysql/test/suite/ndb/t/ndb_types.test
+share/mysql/test/suite/ndb/t/ndb_upd_del_single_to_multi.test
 share/mysql/test/suite/ndb/t/ndb_update.test
 share/mysql/test/suite/ndb/t/ndb_update_no_read.test
 share/mysql/test/suite/ndb/t/ndb_var_mem_usage.inc
@@ -10277,6 +11345,7 @@ share/mysql/test/suite/ndb/t/ndb_wl946_select_all.inc
 share/mysql/test/suite/ndb/t/ndbapi-examples.test
 share/mysql/test/suite/ndb/t/ndbinfo.cnf
 share/mysql/test/suite/ndb/t/ndbinfo.test
+share/mysql/test/suite/ndb/t/ndbinfo_backup.cnf
 share/mysql/test/suite/ndb/t/ndbinfo_backup.test
 share/mysql/test/suite/ndb/t/ndbinfo_cluster_locks.cnf
 share/mysql/test/suite/ndb/t/ndbinfo_cluster_locks.test
@@ -10284,17 +11353,24 @@ share/mysql/test/suite/ndb/t/ndbinfo_cpustat.test
 share/mysql/test/suite/ndb/t/ndbinfo_dump.test
 share/mysql/test/suite/ndb/t/ndbinfo_init_frag_lock_count.inc
 share/mysql/test/suite/ndb/t/ndbinfo_locks_per_fragment.test
+share/mysql/test/suite/ndb/t/ndbinfo_no_upgrade.test
 share/mysql/test/suite/ndb/t/ndbinfo_server_locks.test
 share/mysql/test/suite/ndb/t/ndbinfo_show_locks_delta.inc
 share/mysql/test/suite/ndb/t/ndbinfo_tables.test
 share/mysql/test/suite/ndb/t/ndbinfo_upgrade.test
 share/mysql/test/suite/ndb/t/ndbinfo_wait_frag_lock_count.inc
+share/mysql/test/suite/ndb/t/nodegroup_1_2_1_2.cnf
+share/mysql/test/suite/ndb/t/nodegroup_1_2_1_2.test
+share/mysql/test/suite/ndb/t/print_foreign_keys.inc
 share/mysql/test/suite/ndb/t/ps_7ndb.test
 share/mysql/test/suite/ndb/t/show_attributes.inc
 share/mysql/test/suite/ndb/t/show_indexes.inc
 share/mysql/test/suite/ndb/t/show_primary_keys.inc
 share/mysql/test/suite/ndb/t/show_varpart.inc
+share/mysql/test/suite/ndb/t/stored_grants_binlog_setup.test
 share/mysql/test/suite/ndb/t/stored_grants_error_handling.test
+share/mysql/test/suite/ndb/t/stored_grants_val_pass-master.opt
+share/mysql/test/suite/ndb/t/stored_grants_val_pass.test
 share/mysql/test/suite/ndb/t/strict_autoinc_5ndb.test
 share/mysql/test/suite/ndb/t/test_debugger.test
 share/mysql/test/suite/ndb/t/test_mgm.test
@@ -10302,7 +11378,7 @@ share/mysql/test/suite/ndb/t/test_mgmd.cnf
 share/mysql/test/suite/ndb/t/test_mgmd.test
 share/mysql/test/suite/ndb/t/test_ndbinfo.test
 share/mysql/test/suite/ndb/t/wait_metadata_changes_detected.inc
-share/mysql/test/suite/ndb/t/wait_metadata_sync_blacklist_empty.inc
+share/mysql/test/suite/ndb/t/wait_metadata_sync_zero_excluded.inc
 share/mysql/test/suite/ndb/t/wait_metadata_synced.inc
 share/mysql/test/suite/ndb_big/bug13637411-master.opt
 share/mysql/test/suite/ndb_big/bug13637411.cnf
@@ -10357,7 +11433,9 @@ share/mysql/test/suite/ndb_binlog/r/ndb_binlog_purge_startup.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_purge_upgrade.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restart.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_restore.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_sighup.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_size_based_rotate.result
+share/mysql/test/suite/ndb_binlog/r/ndb_binlog_startup_fail.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_test_conflict_flags.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_unique_epoch.result
 share/mysql/test/suite/ndb_binlog/r/ndb_binlog_variant_ddl.result
@@ -10407,7 +11485,10 @@ share/mysql/test/suite/ndb_binlog/t/ndb_binlog_purge_upgrade.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restart.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restart.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_restore.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_sighup.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_size_based_rotate.test
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_startup_fail.cnf
+share/mysql/test/suite/ndb_binlog/t/ndb_binlog_startup_fail.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_test_conflict_flags.test
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.cnf
 share/mysql/test/suite/ndb_binlog/t/ndb_binlog_unique_epoch.test
@@ -10438,6 +11519,10 @@ share/mysql/test/suite/ndb_ddl/alter_inplace.result
 share/mysql/test/suite/ndb_ddl/alter_inplace.test
 share/mysql/test/suite/ndb_ddl/alter_inplace_fail.result
 share/mysql/test/suite/ndb_ddl/alter_inplace_fail.test
+share/mysql/test/suite/ndb_ddl/alter_inplace_tablespace.result
+share/mysql/test/suite/ndb_ddl/alter_inplace_tablespace.test
+share/mysql/test/suite/ndb_ddl/alter_inplace_unique_index.result
+share/mysql/test/suite/ndb_ddl/alter_inplace_unique_index.test
 share/mysql/test/suite/ndb_ddl/alter_max_rows.result
 share/mysql/test/suite/ndb_ddl/alter_max_rows.test
 share/mysql/test/suite/ndb_ddl/alter_open_trans.result
@@ -10464,9 +11549,12 @@ share/mysql/test/suite/ndb_ddl/alter_rename_update_fk_name.result
 share/mysql/test/suite/ndb_ddl/alter_rename_update_fk_name.test
 share/mysql/test/suite/ndb_ddl/alter_rename_update_fk_name_fail.result
 share/mysql/test/suite/ndb_ddl/alter_rename_update_fk_name_fail.test
+share/mysql/test/suite/ndb_ddl/alter_schema.result
+share/mysql/test/suite/ndb_ddl/alter_schema.test
 share/mysql/test/suite/ndb_ddl/alter_use_copying.result
 share/mysql/test/suite/ndb_ddl/alter_use_copying.test
 share/mysql/test/suite/ndb_ddl/check_event_for_table.inc
+share/mysql/test/suite/ndb_ddl/check_ndb_schema_upgrade_status.inc
 share/mysql/test/suite/ndb_ddl/check_util_table_drop.inc
 share/mysql/test/suite/ndb_ddl/cleanup.inc
 share/mysql/test/suite/ndb_ddl/connect.inc
@@ -10481,6 +11569,8 @@ share/mysql/test/suite/ndb_ddl/create_table_select_fail.result
 share/mysql/test/suite/ndb_ddl/create_table_select_fail.test
 share/mysql/test/suite/ndb_ddl/dist_priv_migration.result
 share/mysql/test/suite/ndb_ddl/dist_priv_migration.test
+share/mysql/test/suite/ndb_ddl/drop_database.result
+share/mysql/test/suite/ndb_ddl/drop_database.test
 share/mysql/test/suite/ndb_ddl/drop_table_consistency.cnf
 share/mysql/test/suite/ndb_ddl/drop_table_consistency.result
 share/mysql/test/suite/ndb_ddl/drop_table_consistency.test
@@ -10492,7 +11582,10 @@ share/mysql/test/suite/ndb_ddl/identifier_limits.result
 share/mysql/test/suite/ndb_ddl/identifier_limits.test
 share/mysql/test/suite/ndb_ddl/identifier_limits63_debug.result
 share/mysql/test/suite/ndb_ddl/identifier_limits63_debug.test
+share/mysql/test/suite/ndb_ddl/identifiers.result
+share/mysql/test/suite/ndb_ddl/identifiers.test
 share/mysql/test/suite/ndb_ddl/list_objects.inc
+share/mysql/test/suite/ndb_ddl/metadata_immediate_sync.cnf
 share/mysql/test/suite/ndb_ddl/metadata_immediate_sync.result
 share/mysql/test/suite/ndb_ddl/metadata_immediate_sync.test
 share/mysql/test/suite/ndb_ddl/metadata_sync.cnf
@@ -10501,6 +11594,9 @@ share/mysql/test/suite/ndb_ddl/metadata_sync.test
 share/mysql/test/suite/ndb_ddl/metadata_sync_debug.cnf
 share/mysql/test/suite/ndb_ddl/metadata_sync_debug.result
 share/mysql/test/suite/ndb_ddl/metadata_sync_debug.test
+share/mysql/test/suite/ndb_ddl/metadata_sync_pfs.cnf
+share/mysql/test/suite/ndb_ddl/metadata_sync_pfs.result
+share/mysql/test/suite/ndb_ddl/metadata_sync_pfs.test
 share/mysql/test/suite/ndb_ddl/metadata_sync_restore_disable_index.cnf
 share/mysql/test/suite/ndb_ddl/metadata_sync_restore_disable_index.result
 share/mysql/test/suite/ndb_ddl/metadata_sync_restore_disable_index.test
@@ -10517,14 +11613,21 @@ share/mysql/test/suite/ndb_ddl/rename_single.test
 share/mysql/test/suite/ndb_ddl/retrieve_event_list.inc
 share/mysql/test/suite/ndb_ddl/schema_dist_client_abort.result
 share/mysql/test/suite/ndb_ddl/schema_dist_client_abort.test
+share/mysql/test/suite/ndb_ddl/schema_dist_client_wait.result
+share/mysql/test/suite/ndb_ddl/schema_dist_client_wait.test
 share/mysql/test/suite/ndb_ddl/schema_dist_coord_abort.result
 share/mysql/test/suite/ndb_ddl/schema_dist_coord_abort.test
+share/mysql/test/suite/ndb_ddl/schema_dist_deferred_upgrade.cnf
+share/mysql/test/suite/ndb_ddl/schema_dist_deferred_upgrade.result
+share/mysql/test/suite/ndb_ddl/schema_dist_deferred_upgrade.test
 share/mysql/test/suite/ndb_ddl/schema_dist_lock_wait_timeout.result
 share/mysql/test/suite/ndb_ddl/schema_dist_lock_wait_timeout.test
 share/mysql/test/suite/ndb_ddl/schema_dist_ndb_trans_failure.result
 share/mysql/test/suite/ndb_ddl/schema_dist_ndb_trans_failure.test
 share/mysql/test/suite/ndb_ddl/schema_dist_participant_fail.result
 share/mysql/test/suite/ndb_ddl/schema_dist_participant_fail.test
+share/mysql/test/suite/ndb_ddl/schema_dist_participant_restart.result
+share/mysql/test/suite/ndb_ddl/schema_dist_participant_restart.test
 share/mysql/test/suite/ndb_ddl/schema_dist_participant_timeout.cnf
 share/mysql/test/suite/ndb_ddl/schema_dist_participant_timeout.result
 share/mysql/test/suite/ndb_ddl/schema_dist_participant_timeout.test
@@ -10536,6 +11639,7 @@ share/mysql/test/suite/ndb_ddl/schema_trans_fail.test
 share/mysql/test/suite/ndb_ddl/setup.inc
 share/mysql/test/suite/ndb_ddl/shadow_table.result
 share/mysql/test/suite/ndb_ddl/shadow_table.test
+share/mysql/test/suite/ndb_ddl/show_name_of_special_table.inc
 share/mysql/test/suite/ndb_ddl/table_event.result
 share/mysql/test/suite/ndb_ddl/table_event.test
 share/mysql/test/suite/ndb_ddl/tablespace_mdl.cnf
@@ -10550,52 +11654,50 @@ share/mysql/test/suite/ndb_ddl/verify_foreign_keys.inc
 share/mysql/test/suite/ndb_ddl/verify_mysql_dd.inc
 share/mysql/test/suite/ndb_ddl/wait_immediate_metadata_sync.inc
 share/mysql/test/suite/ndb_ddl/wait_metadata_changes_detected.inc
-share/mysql/test/suite/ndb_ddl/wait_metadata_sync_blacklist_empty.inc
+share/mysql/test/suite/ndb_ddl/wait_metadata_sync_zero_excluded.inc
 share/mysql/test/suite/ndb_ddl/wait_metadata_synced.inc
-share/mysql/test/suite/ndb_memcache/include/datatypes_tables.inc
-share/mysql/test/suite/ndb_memcache/include/have_memcache.inc
-share/mysql/test/suite/ndb_memcache/include/memcached_wait_for_ready.inc
-share/mysql/test/suite/ndb_memcache/include/misc_tables.inc
-share/mysql/test/suite/ndb_memcache/include/wait_for_reconf.inc
-share/mysql/test/suite/ndb_memcache/my.cnf
-share/mysql/test/suite/ndb_memcache/r/basic.result
-share/mysql/test/suite/ndb_memcache/r/external_values.result
-share/mysql/test/suite/ndb_memcache/r/lib_ascii.result
-share/mysql/test/suite/ndb_memcache/r/lib_binary.result
-share/mysql/test/suite/ndb_memcache/r/math1.result
-share/mysql/test/suite/ndb_memcache/r/math2.result
-share/mysql/test/suite/ndb_memcache/r/math3.result
-share/mysql/test/suite/ndb_memcache/r/mpart_key.result
-share/mysql/test/suite/ndb_memcache/r/reconf1.result
-share/mysql/test/suite/ndb_memcache/r/tsv1.result
-share/mysql/test/suite/ndb_memcache/r/tsv2.result
-share/mysql/test/suite/ndb_memcache/r/ttls_flags.result
-share/mysql/test/suite/ndb_memcache/r/type_binary.result
-share/mysql/test/suite/ndb_memcache/r/type_char.result
-share/mysql/test/suite/ndb_memcache/r/type_numeric.result
-share/mysql/test/suite/ndb_memcache/r/type_signed.result
-share/mysql/test/suite/ndb_memcache/r/type_temporal.result
-share/mysql/test/suite/ndb_memcache/r/type_unsigned.result
-share/mysql/test/suite/ndb_memcache/r/unique_idx.result
-share/mysql/test/suite/ndb_memcache/t/basic.test
-share/mysql/test/suite/ndb_memcache/t/external_values.test
-share/mysql/test/suite/ndb_memcache/t/lib_ascii.test
-share/mysql/test/suite/ndb_memcache/t/lib_binary.test
-share/mysql/test/suite/ndb_memcache/t/math1.test
-share/mysql/test/suite/ndb_memcache/t/math2.test
-share/mysql/test/suite/ndb_memcache/t/math3.test
-share/mysql/test/suite/ndb_memcache/t/mpart_key.test
-share/mysql/test/suite/ndb_memcache/t/reconf1.test
-share/mysql/test/suite/ndb_memcache/t/tsv1.test
-share/mysql/test/suite/ndb_memcache/t/tsv2.test
-share/mysql/test/suite/ndb_memcache/t/ttls_flags.test
-share/mysql/test/suite/ndb_memcache/t/type_binary.test
-share/mysql/test/suite/ndb_memcache/t/type_char.test
-share/mysql/test/suite/ndb_memcache/t/type_numeric.test
-share/mysql/test/suite/ndb_memcache/t/type_signed.test
-share/mysql/test/suite/ndb_memcache/t/type_temporal.test
-share/mysql/test/suite/ndb_memcache/t/type_unsigned.test
-share/mysql/test/suite/ndb_memcache/t/unique_idx.test
+share/mysql/test/suite/ndb_opt/bushy_joins.cnf
+share/mysql/test/suite/ndb_opt/bushy_joins.result
+share/mysql/test/suite/ndb_opt/bushy_joins.test
+share/mysql/test/suite/ndb_opt/condition_pushdown.result
+share/mysql/test/suite/ndb_opt/condition_pushdown.test
+share/mysql/test/suite/ndb_opt/index_stat.result
+share/mysql/test/suite/ndb_opt/index_stat.test
+share/mysql/test/suite/ndb_opt/index_stat_enable.inc
+share/mysql/test/suite/ndb_opt/index_stat_partitions.result
+share/mysql/test/suite/ndb_opt/index_stat_partitions.test
+share/mysql/test/suite/ndb_opt/index_stat_restart.cnf
+share/mysql/test/suite/ndb_opt/index_stat_restart.result
+share/mysql/test/suite/ndb_opt/index_stat_restart.test
+share/mysql/test/suite/ndb_opt/index_stat_tables.result
+share/mysql/test/suite/ndb_opt/index_stat_tables.test
+share/mysql/test/suite/ndb_opt/join_pushdown.inc
+share/mysql/test/suite/ndb_opt/join_pushdown_bka.result
+share/mysql/test/suite/ndb_opt/join_pushdown_bka.test
+share/mysql/test/suite/ndb_opt/join_pushdown_default.result
+share/mysql/test/suite/ndb_opt/join_pushdown_default.test
+share/mysql/test/suite/ndb_opt/join_pushdown_nobnl.result
+share/mysql/test/suite/ndb_opt/join_pushdown_nobnl.test
+share/mysql/test/suite/ndb_opt/join_pushdown_none.result
+share/mysql/test/suite/ndb_opt/join_pushdown_none.test
+share/mysql/test/suite/ndb_opt/my.cnf
+share/mysql/test/suite/ndb_opt/rbwr.inc
+share/mysql/test/suite/ndb_opt/rbwr.result
+share/mysql/test/suite/ndb_opt/rbwr.test
+share/mysql/test/suite/ndb_opt/spj_dict.result
+share/mysql/test/suite/ndb_opt/spj_dict.test
+share/mysql/test/suite/ndb_opt/spj_rqg.cnf
+share/mysql/test/suite/ndb_opt/spj_rqg.result
+share/mysql/test/suite/ndb_opt/spj_rqg.test
+share/mysql/test/suite/ndb_opt/spj_skew.result
+share/mysql/test/suite/ndb_opt/spj_skew.test
+share/mysql/test/suite/ndb_opt/statistics.inc
+share/mysql/test/suite/ndb_opt/statistics0.result
+share/mysql/test/suite/ndb_opt/statistics0.test
+share/mysql/test/suite/ndb_opt/statistics1.result
+share/mysql/test/suite/ndb_opt/statistics1.test
+share/mysql/test/suite/ndb_opt/subquery.result
+share/mysql/test/suite/ndb_opt/subquery.test
 share/mysql/test/suite/ndb_rpl/my.cnf
 share/mysql/test/suite/ndb_rpl/ndb_master-slave.inc
 share/mysql/test/suite/ndb_rpl/ndb_master-slave_2ch.inc
@@ -10608,6 +11710,7 @@ share/mysql/test/suite/ndb_rpl/r/ndb_rpl_2other.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_add_column.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_alter_column.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_alter_wide_table.result
+share/mysql/test/suite/ndb_rpl/r/ndb_rpl_applier_conflict_role_var.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_apply_status.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_auto_inc.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_backup_epoch.result
@@ -10618,6 +11721,7 @@ share/mysql/test/suite/ndb_rpl/r/ndb_rpl_binlog_format_errors.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_binlog_row_image_minimal.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_bitfield.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_blob.result
+share/mysql/test/suite/ndb_rpl/r/ndb_rpl_blob_batching.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_break_3_chain.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_bug22045.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_bug_13440282.result
@@ -10674,7 +11778,6 @@ share/mysql/test/suite/ndb_rpl/r/ndb_rpl_rowsize30000.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_skip_gap_event.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_binlog_index.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_config.result
-share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_conflict_role_var.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_lsu.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_lsu_anyval.result
 share/mysql/test/suite/ndb_rpl/r/ndb_rpl_slave_multi_source_config.result
@@ -10712,6 +11815,7 @@ share/mysql/test/suite/ndb_rpl/t/ndb_rpl_alter_column.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_alter_wide_table.cnf
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_alter_wide_table.inc
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_alter_wide_table.test
+share/mysql/test/suite/ndb_rpl/t/ndb_rpl_applier_conflict_role_var.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_apply_status-master.opt
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_apply_status.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_auto_inc.test
@@ -10724,6 +11828,7 @@ share/mysql/test/suite/ndb_rpl/t/ndb_rpl_binlog_row_image_minimal-master.opt
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_binlog_row_image_minimal.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_bitfield.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_blob.test
+share/mysql/test/suite/ndb_rpl/t/ndb_rpl_blob_batching.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.cnf
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_break_3_chain.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_bug22045.test
@@ -10824,7 +11929,6 @@ share/mysql/test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event-slave.opt
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_skip_gap_event.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_binlog_index.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_config.test
-share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_conflict_role_var.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.cnf
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_lsu.test
 share/mysql/test/suite/ndb_rpl/t/ndb_rpl_slave_lsu_anyval.cnf
@@ -10868,6 +11972,8 @@ share/mysql/test/suite/ndbcluster/basic.result
 share/mysql/test/suite/ndbcluster/basic.test
 share/mysql/test/suite/ndbcluster/binlog_index_table.result
 share/mysql/test/suite/ndbcluster/binlog_index_table.test
+share/mysql/test/suite/ndbcluster/charset.result
+share/mysql/test/suite/ndbcluster/charset.test
 share/mysql/test/suite/ndbcluster/check_constraints.result
 share/mysql/test/suite/ndbcluster/check_constraints.test
 share/mysql/test/suite/ndbcluster/drop_table.result
@@ -10888,6 +11994,8 @@ share/mysql/test/suite/ndbcluster/information_schema_fk.result
 share/mysql/test/suite/ndbcluster/information_schema_fk.test
 share/mysql/test/suite/ndbcluster/information_schema_partitions.result
 share/mysql/test/suite/ndbcluster/information_schema_partitions.test
+share/mysql/test/suite/ndbcluster/invisible_columns.result
+share/mysql/test/suite/ndbcluster/invisible_columns.test
 share/mysql/test/suite/ndbcluster/invisible_indexes.result
 share/mysql/test/suite/ndbcluster/invisible_indexes.test
 share/mysql/test/suite/ndbcluster/my.cnf
@@ -10903,6 +12011,8 @@ share/mysql/test/suite/ndbcluster/row_format.result
 share/mysql/test/suite/ndbcluster/row_format.test
 share/mysql/test/suite/ndbcluster/select_count.result
 share/mysql/test/suite/ndbcluster/select_count.test
+share/mysql/test/suite/ndbcluster/table_comments_debug.result
+share/mysql/test/suite/ndbcluster/table_comments_debug.test
 share/mysql/test/suite/ndbcluster/table_private_id.result
 share/mysql/test/suite/ndbcluster/table_private_id.test
 share/mysql/test/suite/ndbcluster/tablename_limit.result
@@ -10913,6 +12023,9 @@ share/mysql/test/suite/ndbcluster/tablespace_datafiles.result
 share/mysql/test/suite/ndbcluster/tablespace_datafiles.test
 share/mysql/test/suite/ndbcluster/tablespace_storage.result
 share/mysql/test/suite/ndbcluster/tablespace_storage.test
+share/mysql/test/suite/ndbcluster/temp_tables-master.opt
+share/mysql/test/suite/ndbcluster/temp_tables.result
+share/mysql/test/suite/ndbcluster/temp_tables.test
 share/mysql/test/suite/ndbcluster/trans_hint_count.result
 share/mysql/test/suite/ndbcluster/trans_hint_count.test
 share/mysql/test/suite/ndbcluster/truncate.result
@@ -10925,11 +12038,13 @@ share/mysql/test/suite/network_namespace/r/network_namespace.result
 share/mysql/test/suite/network_namespace/r/network_namespace_errors.result
 share/mysql/test/suite/network_namespace/r/network_namespace_ipv6.result
 share/mysql/test/suite/network_namespace/r/rpl_network_namespace.result
+share/mysql/test/suite/network_namespace/r/rpl_network_namespace_debug.result
 share/mysql/test/suite/network_namespace/r/x_network_namespace.result
 share/mysql/test/suite/network_namespace/t/network_namespace.test
 share/mysql/test/suite/network_namespace/t/network_namespace_errors.test
 share/mysql/test/suite/network_namespace/t/network_namespace_ipv6.test
 share/mysql/test/suite/network_namespace/t/rpl_network_namespace.test
+share/mysql/test/suite/network_namespace/t/rpl_network_namespace_debug.test
 share/mysql/test/suite/network_namespace/t/x_network_namespace-master.opt
 share/mysql/test/suite/network_namespace/t/x_network_namespace.test
 share/mysql/test/suite/opt_trace/include/bugs.inc
@@ -10945,6 +12060,7 @@ share/mysql/test/suite/opt_trace/r/bugs_ps_prot_all.result
 share/mysql/test/suite/opt_trace/r/bugs_ps_prot_none.result
 share/mysql/test/suite/opt_trace/r/charset.result
 share/mysql/test/suite/opt_trace/r/debug.result
+share/mysql/test/suite/opt_trace/r/derived_condition_pushdown.result
 share/mysql/test/suite/opt_trace/r/eq_range_statistics.result
 share/mysql/test/suite/opt_trace/r/filesort_pack.result
 share/mysql/test/suite/opt_trace/r/filesort_pq.result
@@ -10976,6 +12092,7 @@ share/mysql/test/suite/opt_trace/t/bugs_ps_prot_none.test
 share/mysql/test/suite/opt_trace/t/charset-master.opt
 share/mysql/test/suite/opt_trace/t/charset.test
 share/mysql/test/suite/opt_trace/t/debug.test
+share/mysql/test/suite/opt_trace/t/derived_condition_pushdown.test
 share/mysql/test/suite/opt_trace/t/eq_range_statistics-master.opt
 share/mysql/test/suite/opt_trace/t/eq_range_statistics.test
 share/mysql/test/suite/opt_trace/t/filesort_pack-master.opt
@@ -11221,6 +12338,7 @@ share/mysql/test/suite/parts/t/part_supported_sql_func_innodb.test
 share/mysql/test/suite/parts/t/partition-dml-1-1-innodb-modes.test
 share/mysql/test/suite/parts/t/partition-dml-1-1-innodb.test
 share/mysql/test/suite/parts/t/partition-dml-1-10-innodb.test
+share/mysql/test/suite/parts/t/partition-dml-1-11-innodb-master.opt
 share/mysql/test/suite/parts/t/partition-dml-1-11-innodb.test
 share/mysql/test/suite/parts/t/partition-dml-1-12-innodb.test
 share/mysql/test/suite/parts/t/partition-dml-1-2-innodb.test
@@ -11243,6 +12361,7 @@ share/mysql/test/suite/parts/t/partition_alter4_innodb.test
 share/mysql/test/suite/parts/t/partition_analyze.test
 share/mysql/test/suite/parts/t/partition_auto_increment_innodb.test
 share/mysql/test/suite/parts/t/partition_basic_innodb.test
+share/mysql/test/suite/parts/t/partition_basic_symlink_innodb-master.opt
 share/mysql/test/suite/parts/t/partition_basic_symlink_innodb.test
 share/mysql/test/suite/parts/t/partition_bit_innodb.test
 share/mysql/test/suite/parts/t/partition_change_from_range_to_hash_key.test
@@ -11259,6 +12378,7 @@ share/mysql/test/suite/parts/t/partition_exch_qa_10.test
 share/mysql/test/suite/parts/t/partition_exch_qa_11.test
 share/mysql/test/suite/parts/t/partition_exch_qa_12.test
 share/mysql/test/suite/parts/t/partition_exch_qa_13.test
+share/mysql/test/suite/parts/t/partition_exch_qa_14-master.opt
 share/mysql/test/suite/parts/t/partition_exch_qa_14.test
 share/mysql/test/suite/parts/t/partition_exch_qa_15.test
 share/mysql/test/suite/parts/t/partition_exch_qa_1_innodb.test
@@ -11290,6 +12410,7 @@ share/mysql/test/suite/parts/t/partition_remove.test
 share/mysql/test/suite/parts/t/partition_reorg_divide.test
 share/mysql/test/suite/parts/t/partition_reorg_hash_key.test
 share/mysql/test/suite/parts/t/partition_reorg_merge.test
+share/mysql/test/suite/parts/t/partition_reorganize_innodb-master.opt
 share/mysql/test/suite/parts/t/partition_reorganize_innodb.test
 share/mysql/test/suite/parts/t/partition_repair.test
 share/mysql/test/suite/parts/t/partition_reverse_scan_icp.test
@@ -11305,7 +12426,9 @@ share/mysql/test/suite/parts/t/partition_value_specific.test
 share/mysql/test/suite/parts/t/rpl-partition-dml-1-1-innodb.test
 share/mysql/test/suite/parts/t/rpl_partition.test
 share/mysql/test/suite/perfschema/include/binlog_edge_common.inc
+share/mysql/test/suite/perfschema/include/binlog_edge_common_myisam.inc
 share/mysql/test/suite/perfschema/include/binlog_ok_common.inc
+share/mysql/test/suite/perfschema/include/binlog_ok_common_myisam.inc
 share/mysql/test/suite/perfschema/include/cleanup_helper.inc
 share/mysql/test/suite/perfschema/include/connection_cleanup.inc
 share/mysql/test/suite/perfschema/include/connection_load.inc
@@ -11326,6 +12449,7 @@ share/mysql/test/suite/perfschema/include/idx_compare_cleanup_index_test.inc
 share/mysql/test/suite/perfschema/include/idx_compare_load.inc
 share/mysql/test/suite/perfschema/include/idx_compare_setup.inc
 share/mysql/test/suite/perfschema/include/idx_compare_setup_index_test.inc
+share/mysql/test/suite/perfschema/include/idx_explain_error_log.inc
 share/mysql/test/suite/perfschema/include/idx_explain_test.inc
 share/mysql/test/suite/perfschema/include/memory_aggregate_cleanup.inc
 share/mysql/test/suite/perfschema/include/memory_aggregate_load.inc
@@ -11334,6 +12458,8 @@ share/mysql/test/suite/perfschema/include/prepared_stmts_deallocation.inc
 share/mysql/test/suite/perfschema/include/prepared_stmts_execution.inc
 share/mysql/test/suite/perfschema/include/prepared_stmts_setup.inc
 share/mysql/test/suite/perfschema/include/privilege.inc
+share/mysql/test/suite/perfschema/include/processlist_load.inc
+share/mysql/test/suite/perfschema/include/processlist_set.inc
 share/mysql/test/suite/perfschema/include/program_cleanup.inc
 share/mysql/test/suite/perfschema/include/program_execution.inc
 share/mysql/test/suite/perfschema/include/program_nested_cleanup.inc
@@ -11374,11 +12500,17 @@ share/mysql/test/suite/perfschema/r/alter_table_progress.result
 share/mysql/test/suite/perfschema/r/bad_option.result
 share/mysql/test/suite/perfschema/r/batch_table_io_func.result
 share/mysql/test/suite/perfschema/r/binlog_edge_mix.result
+share/mysql/test/suite/perfschema/r/binlog_edge_mix_myisam.result
 share/mysql/test/suite/perfschema/r/binlog_edge_row.result
+share/mysql/test/suite/perfschema/r/binlog_edge_row_myisam.result
 share/mysql/test/suite/perfschema/r/binlog_edge_stmt.result
+share/mysql/test/suite/perfschema/r/binlog_edge_stmt_myisam.result
 share/mysql/test/suite/perfschema/r/binlog_ok_mix.result
+share/mysql/test/suite/perfschema/r/binlog_ok_mix_myisam.result
 share/mysql/test/suite/perfschema/r/binlog_ok_row.result
+share/mysql/test/suite/perfschema/r/binlog_ok_row_myisam.result
 share/mysql/test/suite/perfschema/r/binlog_ok_stmt.result
+share/mysql/test/suite/perfschema/r/binlog_ok_stmt_myisam.result
 share/mysql/test/suite/perfschema/r/checksum.result
 share/mysql/test/suite/perfschema/r/cnf_option.result
 share/mysql/test/suite/perfschema/r/column_privilege.result
@@ -11394,6 +12526,7 @@ share/mysql/test/suite/perfschema/r/data_lock_waits_join.result
 share/mysql/test/suite/perfschema/r/data_locks_join.result
 share/mysql/test/suite/perfschema/r/dd_version_check.result
 share/mysql/test/suite/perfschema/r/ddl_accounts.result
+share/mysql/test/suite/perfschema/r/ddl_binary_log_transaction_compression_stats.result
 share/mysql/test/suite/perfschema/r/ddl_cond_instances.result
 share/mysql/test/suite/perfschema/r/ddl_data_lock_waits.result
 share/mysql/test/suite/perfschema/r/ddl_data_locks.result
@@ -11402,6 +12535,7 @@ share/mysql/test/suite/perfschema/r/ddl_ees_by_host_by_error.result
 share/mysql/test/suite/perfschema/r/ddl_ees_by_thread_by_error.result
 share/mysql/test/suite/perfschema/r/ddl_ees_by_user_by_error.result
 share/mysql/test/suite/perfschema/r/ddl_ees_global_by_error.result
+share/mysql/test/suite/perfschema/r/ddl_error_log.result
 share/mysql/test/suite/perfschema/r/ddl_esgs_by_account_by_event_name.result
 share/mysql/test/suite/perfschema/r/ddl_esgs_by_host_by_event_name.result
 share/mysql/test/suite/perfschema/r/ddl_esgs_by_thread_by_event_name.result
@@ -11446,6 +12580,7 @@ share/mysql/test/suite/perfschema/r/ddl_global_status.result
 share/mysql/test/suite/perfschema/r/ddl_global_variables.result
 share/mysql/test/suite/perfschema/r/ddl_host_cache.result
 share/mysql/test/suite/perfschema/r/ddl_hosts.result
+share/mysql/test/suite/perfschema/r/ddl_keyring_component_status.result
 share/mysql/test/suite/perfschema/r/ddl_keyring_keys.result
 share/mysql/test/suite/perfschema/r/ddl_log_status.result
 share/mysql/test/suite/perfschema/r/ddl_mems_by_account_by_event_name.result
@@ -11459,6 +12594,7 @@ share/mysql/test/suite/perfschema/r/ddl_os_global_by_type.result
 share/mysql/test/suite/perfschema/r/ddl_performance_timers.result
 share/mysql/test/suite/perfschema/r/ddl_persisted_variables.result
 share/mysql/test/suite/perfschema/r/ddl_prepared_statements_instances.result
+share/mysql/test/suite/perfschema/r/ddl_processlist.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_configuration.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_filters.result
 share/mysql/test/suite/perfschema/r/ddl_replication_applier_global_filters.result
@@ -11490,6 +12626,7 @@ share/mysql/test/suite/perfschema/r/ddl_table_handles.result
 share/mysql/test/suite/perfschema/r/ddl_threads.result
 share/mysql/test/suite/perfschema/r/ddl_tiws_by_index_usage.result
 share/mysql/test/suite/perfschema/r/ddl_tiws_by_table.result
+share/mysql/test/suite/perfschema/r/ddl_tls_channel_status.result
 share/mysql/test/suite/perfschema/r/ddl_tlws_by_table.result
 share/mysql/test/suite/perfschema/r/ddl_user_defined_functions.result
 share/mysql/test/suite/perfschema/r/ddl_users.result
@@ -11499,6 +12636,7 @@ share/mysql/test/suite/perfschema/r/ddl_variables_info.result
 share/mysql/test/suite/perfschema/r/digest_null_literal.result
 share/mysql/test/suite/perfschema/r/digest_table_full.result
 share/mysql/test/suite/perfschema/r/dml_accounts.result
+share/mysql/test/suite/perfschema/r/dml_binary_log_transaction_compression_stats.result
 share/mysql/test/suite/perfschema/r/dml_cond_instances.result
 share/mysql/test/suite/perfschema/r/dml_data_lock_waits.result
 share/mysql/test/suite/perfschema/r/dml_data_locks.result
@@ -11507,6 +12645,7 @@ share/mysql/test/suite/perfschema/r/dml_ees_by_host_by_error.result
 share/mysql/test/suite/perfschema/r/dml_ees_by_thread_by_error.result
 share/mysql/test/suite/perfschema/r/dml_ees_by_user_by_error.result
 share/mysql/test/suite/perfschema/r/dml_ees_global_by_error.result
+share/mysql/test/suite/perfschema/r/dml_error_log.result
 share/mysql/test/suite/perfschema/r/dml_esgs_by_account_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_esgs_by_host_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_esgs_by_thread_by_event_name.result
@@ -11545,6 +12684,7 @@ share/mysql/test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_ews_by_user_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_ews_global_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_file_instances.result
+share/mysql/test/suite/perfschema/r/dml_file_instances_myisam.result
 share/mysql/test/suite/perfschema/r/dml_fs_by_event_name.result
 share/mysql/test/suite/perfschema/r/dml_fs_by_instance.result
 share/mysql/test/suite/perfschema/r/dml_global_status.result
@@ -11552,6 +12692,7 @@ share/mysql/test/suite/perfschema/r/dml_global_variables.result
 share/mysql/test/suite/perfschema/r/dml_handler.result
 share/mysql/test/suite/perfschema/r/dml_host_cache.result
 share/mysql/test/suite/perfschema/r/dml_hosts.result
+share/mysql/test/suite/perfschema/r/dml_keyring_component_status.result
 share/mysql/test/suite/perfschema/r/dml_keyring_keys.result
 share/mysql/test/suite/perfschema/r/dml_log_status.result
 share/mysql/test/suite/perfschema/r/dml_mems_by_account_by_event_name.result
@@ -11565,6 +12706,7 @@ share/mysql/test/suite/perfschema/r/dml_os_global_by_type.result
 share/mysql/test/suite/perfschema/r/dml_performance_timers.result
 share/mysql/test/suite/perfschema/r/dml_persisted_variables.result
 share/mysql/test/suite/perfschema/r/dml_prepared_statements_instances.result
+share/mysql/test/suite/perfschema/r/dml_processlist.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_configuration.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_filters.result
 share/mysql/test/suite/perfschema/r/dml_replication_applier_global_filters.result
@@ -11596,12 +12738,15 @@ share/mysql/test/suite/perfschema/r/dml_table_handles.result
 share/mysql/test/suite/perfschema/r/dml_threads.result
 share/mysql/test/suite/perfschema/r/dml_tiws_by_index_usage.result
 share/mysql/test/suite/perfschema/r/dml_tiws_by_table.result
+share/mysql/test/suite/perfschema/r/dml_tls_channel_status.result
 share/mysql/test/suite/perfschema/r/dml_tlws_by_table.result
 share/mysql/test/suite/perfschema/r/dml_user_defined_functions.result
 share/mysql/test/suite/perfschema/r/dml_users.result
 share/mysql/test/suite/perfschema/r/dml_uvar_by_thread.result
 share/mysql/test/suite/perfschema/r/dml_variables_by_thread.result
 share/mysql/test/suite/perfschema/r/dml_variables_info.result
+share/mysql/test/suite/perfschema/r/error_log.result
+share/mysql/test/suite/perfschema/r/error_log_debug.result
 share/mysql/test/suite/perfschema/r/error_stats_summary.result
 share/mysql/test/suite/perfschema/r/event_aggregate.result
 share/mysql/test/suite/perfschema/r/event_aggregate_no_a.result
@@ -11748,6 +12893,7 @@ share/mysql/test/suite/perfschema/r/idx_ees_by_host_by_error.result
 share/mysql/test/suite/perfschema/r/idx_ees_by_thread_by_error.result
 share/mysql/test/suite/perfschema/r/idx_ees_by_user_by_error.result
 share/mysql/test/suite/perfschema/r/idx_ees_global_by_error.result
+share/mysql/test/suite/perfschema/r/idx_error_log.result
 share/mysql/test/suite/perfschema/r/idx_esgs_by_account_by_event_name.result
 share/mysql/test/suite/perfschema/r/idx_esgs_by_host_by_event_name.result
 share/mysql/test/suite/perfschema/r/idx_esgs_by_thread_by_event_name.result
@@ -11793,6 +12939,7 @@ share/mysql/test/suite/perfschema/r/idx_global_variables.result
 share/mysql/test/suite/perfschema/r/idx_host_cache.result
 share/mysql/test/suite/perfschema/r/idx_hosts.result
 share/mysql/test/suite/perfschema/r/idx_joins.result
+share/mysql/test/suite/perfschema/r/idx_keyring_component_status.result
 share/mysql/test/suite/perfschema/r/idx_keyring_keys.result
 share/mysql/test/suite/perfschema/r/idx_mems_by_account_by_event_name.result
 share/mysql/test/suite/perfschema/r/idx_mems_by_host_by_event_name.result
@@ -11805,6 +12952,7 @@ share/mysql/test/suite/perfschema/r/idx_os_global_by_type.result
 share/mysql/test/suite/perfschema/r/idx_performance_timers.result
 share/mysql/test/suite/perfschema/r/idx_persisted_variables.result
 share/mysql/test/suite/perfschema/r/idx_prepared_statements_instances.result
+share/mysql/test/suite/perfschema/r/idx_processlist.result
 share/mysql/test/suite/perfschema/r/idx_replication_applier_configuration.result
 share/mysql/test/suite/perfschema/r/idx_replication_applier_status.result
 share/mysql/test/suite/perfschema/r/idx_replication_applier_status_by_coordinator.result
@@ -11835,6 +12983,7 @@ share/mysql/test/suite/perfschema/r/idx_table_handles.result
 share/mysql/test/suite/perfschema/r/idx_threads.result
 share/mysql/test/suite/perfschema/r/idx_tiws_by_index_usage.result
 share/mysql/test/suite/perfschema/r/idx_tiws_by_table.result
+share/mysql/test/suite/perfschema/r/idx_tls_channel_status.result
 share/mysql/test/suite/perfschema/r/idx_tlws_by_table.result
 share/mysql/test/suite/perfschema/r/idx_users.result
 share/mysql/test/suite/perfschema/r/idx_uvar_by_thread.result
@@ -11867,6 +13016,7 @@ share/mysql/test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
 share/mysql/test/suite/perfschema/r/memory_aggregate_no_h.result
 share/mysql/test/suite/perfschema/r/memory_aggregate_no_u.result
 share/mysql/test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
+share/mysql/test/suite/perfschema/r/memory_key_descriptions.result
 share/mysql/test/suite/perfschema/r/memory_table_io.result
 share/mysql/test/suite/perfschema/r/merge_table_io.result
 share/mysql/test/suite/perfschema/r/misc.result
@@ -11890,6 +13040,10 @@ share/mysql/test/suite/perfschema/r/prepared_statements.result
 share/mysql/test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
 share/mysql/test/suite/perfschema/r/privilege.result
 share/mysql/test/suite/perfschema/r/privilege_table_io.result
+share/mysql/test/suite/perfschema/r/processlist.result
+share/mysql/test/suite/perfschema/r/processlist_acl.result
+share/mysql/test/suite/perfschema/r/processlist_no_pfs.result
+share/mysql/test/suite/perfschema/r/processlist_port.result
 share/mysql/test/suite/perfschema/r/read_only.result
 share/mysql/test/suite/perfschema/r/relaylog.result
 share/mysql/test/suite/perfschema/r/rollback_table_io.result
@@ -12008,6 +13162,8 @@ share/mysql/test/suite/perfschema/r/table_aggregate_thread_2u_2t.result
 share/mysql/test/suite/perfschema/r/table_aggregate_thread_2u_3t.result
 share/mysql/test/suite/perfschema/r/table_aggregate_thread_4u_2t.result
 share/mysql/test/suite/perfschema/r/table_aggregate_thread_4u_3t.result
+share/mysql/test/suite/perfschema/r/table_binary_log_transaction_compression_stats_basic.result
+share/mysql/test/suite/perfschema/r/table_binary_log_transaction_compression_stats_restart.result
 share/mysql/test/suite/perfschema/r/table_component.result
 share/mysql/test/suite/perfschema/r/table_component_binlog.result
 share/mysql/test/suite/perfschema/r/table_component_lifecycle.result
@@ -12036,6 +13192,7 @@ share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_2u_3t.result
 share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_2t.result
 share/mysql/test/suite/perfschema/r/table_lock_aggregate_thread_4u_3t.result
 share/mysql/test/suite/perfschema/r/table_name.result
+share/mysql/test/suite/perfschema/r/table_name_myisam.result
 share/mysql/test/suite/perfschema/r/table_plugin.result
 share/mysql/test/suite/perfschema/r/table_plugin_early_load.result
 share/mysql/test/suite/perfschema/r/table_plugin_in_use.result
@@ -12065,16 +13222,28 @@ share/mysql/test/suite/perfschema/t/bad_option.test
 share/mysql/test/suite/perfschema/t/batch_table_io_func.test
 share/mysql/test/suite/perfschema/t/binlog_edge_mix-master.opt
 share/mysql/test/suite/perfschema/t/binlog_edge_mix.test
+share/mysql/test/suite/perfschema/t/binlog_edge_mix_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_edge_mix_myisam.test
 share/mysql/test/suite/perfschema/t/binlog_edge_row-master.opt
 share/mysql/test/suite/perfschema/t/binlog_edge_row.test
+share/mysql/test/suite/perfschema/t/binlog_edge_row_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_edge_row_myisam.test
 share/mysql/test/suite/perfschema/t/binlog_edge_stmt-master.opt
 share/mysql/test/suite/perfschema/t/binlog_edge_stmt.test
+share/mysql/test/suite/perfschema/t/binlog_edge_stmt_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_edge_stmt_myisam.test
 share/mysql/test/suite/perfschema/t/binlog_ok_mix-master.opt
 share/mysql/test/suite/perfschema/t/binlog_ok_mix.test
+share/mysql/test/suite/perfschema/t/binlog_ok_mix_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_ok_mix_myisam.test
 share/mysql/test/suite/perfschema/t/binlog_ok_row-master.opt
 share/mysql/test/suite/perfschema/t/binlog_ok_row.test
+share/mysql/test/suite/perfschema/t/binlog_ok_row_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_ok_row_myisam.test
 share/mysql/test/suite/perfschema/t/binlog_ok_stmt-master.opt
 share/mysql/test/suite/perfschema/t/binlog_ok_stmt.test
+share/mysql/test/suite/perfschema/t/binlog_ok_stmt_myisam-master.opt
+share/mysql/test/suite/perfschema/t/binlog_ok_stmt_myisam.test
 share/mysql/test/suite/perfschema/t/checksum.test
 share/mysql/test/suite/perfschema/t/cnf_option.cnf
 share/mysql/test/suite/perfschema/t/cnf_option.test
@@ -12096,6 +13265,7 @@ share/mysql/test/suite/perfschema/t/data_lock_waits_join.test
 share/mysql/test/suite/perfschema/t/data_locks_join.test
 share/mysql/test/suite/perfschema/t/dd_version_check.test
 share/mysql/test/suite/perfschema/t/ddl_accounts.test
+share/mysql/test/suite/perfschema/t/ddl_binary_log_transaction_compression_stats.test
 share/mysql/test/suite/perfschema/t/ddl_cond_instances.test
 share/mysql/test/suite/perfschema/t/ddl_data_lock_waits.test
 share/mysql/test/suite/perfschema/t/ddl_data_locks.test
@@ -12104,6 +13274,7 @@ share/mysql/test/suite/perfschema/t/ddl_ees_by_host_by_error.test
 share/mysql/test/suite/perfschema/t/ddl_ees_by_thread_by_error.test
 share/mysql/test/suite/perfschema/t/ddl_ees_by_user_by_error.test
 share/mysql/test/suite/perfschema/t/ddl_ees_global_by_error.test
+share/mysql/test/suite/perfschema/t/ddl_error_log.test
 share/mysql/test/suite/perfschema/t/ddl_esgs_by_account_by_event_name.test
 share/mysql/test/suite/perfschema/t/ddl_esgs_by_host_by_event_name.test
 share/mysql/test/suite/perfschema/t/ddl_esgs_by_thread_by_event_name.test
@@ -12148,6 +13319,7 @@ share/mysql/test/suite/perfschema/t/ddl_global_status.test
 share/mysql/test/suite/perfschema/t/ddl_global_variables.test
 share/mysql/test/suite/perfschema/t/ddl_host_cache.test
 share/mysql/test/suite/perfschema/t/ddl_hosts.test
+share/mysql/test/suite/perfschema/t/ddl_keyring_component_status.test
 share/mysql/test/suite/perfschema/t/ddl_keyring_keys.test
 share/mysql/test/suite/perfschema/t/ddl_log_status.test
 share/mysql/test/suite/perfschema/t/ddl_mems_by_account_by_event_name.test
@@ -12161,6 +13333,7 @@ share/mysql/test/suite/perfschema/t/ddl_os_global_by_type.test
 share/mysql/test/suite/perfschema/t/ddl_performance_timers.test
 share/mysql/test/suite/perfschema/t/ddl_persisted_variables.test
 share/mysql/test/suite/perfschema/t/ddl_prepared_statements_instances.test
+share/mysql/test/suite/perfschema/t/ddl_processlist.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_configuration.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_filters.test
 share/mysql/test/suite/perfschema/t/ddl_replication_applier_global_filters.test
@@ -12192,6 +13365,7 @@ share/mysql/test/suite/perfschema/t/ddl_table_handles.test
 share/mysql/test/suite/perfschema/t/ddl_threads.test
 share/mysql/test/suite/perfschema/t/ddl_tiws_by_index_usage.test
 share/mysql/test/suite/perfschema/t/ddl_tiws_by_table.test
+share/mysql/test/suite/perfschema/t/ddl_tls_channel_status.test
 share/mysql/test/suite/perfschema/t/ddl_tlws_by_table.test
 share/mysql/test/suite/perfschema/t/ddl_user_defined_functions.test
 share/mysql/test/suite/perfschema/t/ddl_users.test
@@ -12202,6 +13376,7 @@ share/mysql/test/suite/perfschema/t/digest_null_literal.test
 share/mysql/test/suite/perfschema/t/digest_table_full-master.opt
 share/mysql/test/suite/perfschema/t/digest_table_full.test
 share/mysql/test/suite/perfschema/t/dml_accounts.test
+share/mysql/test/suite/perfschema/t/dml_binary_log_transaction_compression_stats.test
 share/mysql/test/suite/perfschema/t/dml_cond_instances.test
 share/mysql/test/suite/perfschema/t/dml_data_lock_waits.test
 share/mysql/test/suite/perfschema/t/dml_data_locks.test
@@ -12210,6 +13385,7 @@ share/mysql/test/suite/perfschema/t/dml_ees_by_host_by_error.test
 share/mysql/test/suite/perfschema/t/dml_ees_by_thread_by_error.test
 share/mysql/test/suite/perfschema/t/dml_ees_by_user_by_error.test
 share/mysql/test/suite/perfschema/t/dml_ees_global_by_error.test
+share/mysql/test/suite/perfschema/t/dml_error_log.test
 share/mysql/test/suite/perfschema/t/dml_esgs_by_account_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_esgs_by_host_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_esgs_by_thread_by_event_name.test
@@ -12248,6 +13424,7 @@ share/mysql/test/suite/perfschema/t/dml_ews_by_thread_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_ews_by_user_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_ews_global_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_file_instances.test
+share/mysql/test/suite/perfschema/t/dml_file_instances_myisam.test
 share/mysql/test/suite/perfschema/t/dml_fs_by_event_name.test
 share/mysql/test/suite/perfschema/t/dml_fs_by_instance.test
 share/mysql/test/suite/perfschema/t/dml_global_status.test
@@ -12255,6 +13432,7 @@ share/mysql/test/suite/perfschema/t/dml_global_variables.test
 share/mysql/test/suite/perfschema/t/dml_handler.test
 share/mysql/test/suite/perfschema/t/dml_host_cache.test
 share/mysql/test/suite/perfschema/t/dml_hosts.test
+share/mysql/test/suite/perfschema/t/dml_keyring_component_status.test
 share/mysql/test/suite/perfschema/t/dml_keyring_keys.test
 share/mysql/test/suite/perfschema/t/dml_log_status.test
 share/mysql/test/suite/perfschema/t/dml_mems_by_account_by_event_name.test
@@ -12268,6 +13446,7 @@ share/mysql/test/suite/perfschema/t/dml_os_global_by_type.test
 share/mysql/test/suite/perfschema/t/dml_performance_timers.test
 share/mysql/test/suite/perfschema/t/dml_persisted_variables.test
 share/mysql/test/suite/perfschema/t/dml_prepared_statements_instances.test
+share/mysql/test/suite/perfschema/t/dml_processlist.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_configuration.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_filters.test
 share/mysql/test/suite/perfschema/t/dml_replication_applier_global_filters.test
@@ -12299,12 +13478,17 @@ share/mysql/test/suite/perfschema/t/dml_table_handles.test
 share/mysql/test/suite/perfschema/t/dml_threads.test
 share/mysql/test/suite/perfschema/t/dml_tiws_by_index_usage.test
 share/mysql/test/suite/perfschema/t/dml_tiws_by_table.test
+share/mysql/test/suite/perfschema/t/dml_tls_channel_status.test
 share/mysql/test/suite/perfschema/t/dml_tlws_by_table.test
 share/mysql/test/suite/perfschema/t/dml_user_defined_functions.test
 share/mysql/test/suite/perfschema/t/dml_users.test
 share/mysql/test/suite/perfschema/t/dml_uvar_by_thread.test
 share/mysql/test/suite/perfschema/t/dml_variables_by_thread.test
 share/mysql/test/suite/perfschema/t/dml_variables_info.test
+share/mysql/test/suite/perfschema/t/error_log-master.opt
+share/mysql/test/suite/perfschema/t/error_log.test
+share/mysql/test/suite/perfschema/t/error_log_debug-master.opt
+share/mysql/test/suite/perfschema/t/error_log_debug.test
 share/mysql/test/suite/perfschema/t/error_stats_summary.test
 share/mysql/test/suite/perfschema/t/event_aggregate-master.opt
 share/mysql/test/suite/perfschema/t/event_aggregate.test
@@ -12481,6 +13665,8 @@ share/mysql/test/suite/perfschema/t/idx_ees_by_host_by_error.test
 share/mysql/test/suite/perfschema/t/idx_ees_by_thread_by_error.test
 share/mysql/test/suite/perfschema/t/idx_ees_by_user_by_error.test
 share/mysql/test/suite/perfschema/t/idx_ees_global_by_error.test
+share/mysql/test/suite/perfschema/t/idx_error_log-master.opt
+share/mysql/test/suite/perfschema/t/idx_error_log.test
 share/mysql/test/suite/perfschema/t/idx_esgs_by_account_by_event_name.test
 share/mysql/test/suite/perfschema/t/idx_esgs_by_host_by_event_name.test
 share/mysql/test/suite/perfschema/t/idx_esgs_by_thread_by_event_name.test
@@ -12529,6 +13715,7 @@ share/mysql/test/suite/perfschema/t/idx_global_variables.test
 share/mysql/test/suite/perfschema/t/idx_host_cache.test
 share/mysql/test/suite/perfschema/t/idx_hosts.test
 share/mysql/test/suite/perfschema/t/idx_joins.test
+share/mysql/test/suite/perfschema/t/idx_keyring_component_status.test
 share/mysql/test/suite/perfschema/t/idx_keyring_keys-master.opt
 share/mysql/test/suite/perfschema/t/idx_keyring_keys.test
 share/mysql/test/suite/perfschema/t/idx_mems_by_account_by_event_name.test
@@ -12542,6 +13729,7 @@ share/mysql/test/suite/perfschema/t/idx_os_global_by_type.test
 share/mysql/test/suite/perfschema/t/idx_performance_timers.test
 share/mysql/test/suite/perfschema/t/idx_persisted_variables.test
 share/mysql/test/suite/perfschema/t/idx_prepared_statements_instances.test
+share/mysql/test/suite/perfschema/t/idx_processlist.test
 share/mysql/test/suite/perfschema/t/idx_replication_applier_configuration.test
 share/mysql/test/suite/perfschema/t/idx_replication_applier_status.test
 share/mysql/test/suite/perfschema/t/idx_replication_applier_status_by_coordinator.test
@@ -12572,6 +13760,7 @@ share/mysql/test/suite/perfschema/t/idx_table_handles.test
 share/mysql/test/suite/perfschema/t/idx_threads.test
 share/mysql/test/suite/perfschema/t/idx_tiws_by_index_usage.test
 share/mysql/test/suite/perfschema/t/idx_tiws_by_table.test
+share/mysql/test/suite/perfschema/t/idx_tls_channel_status.test
 share/mysql/test/suite/perfschema/t/idx_tlws_by_table.test
 share/mysql/test/suite/perfschema/t/idx_users.test
 share/mysql/test/suite/perfschema/t/idx_uvar_by_thread.test
@@ -12617,6 +13806,7 @@ share/mysql/test/suite/perfschema/t/memory_aggregate_no_u-master.opt
 share/mysql/test/suite/perfschema/t/memory_aggregate_no_u.test
 share/mysql/test/suite/perfschema/t/memory_aggregate_no_u_no_h-master.opt
 share/mysql/test/suite/perfschema/t/memory_aggregate_no_u_no_h.test
+share/mysql/test/suite/perfschema/t/memory_key_descriptions.test
 share/mysql/test/suite/perfschema/t/memory_table_io.test
 share/mysql/test/suite/perfschema/t/merge_table_io.test
 share/mysql/test/suite/perfschema/t/misc.test
@@ -12652,6 +13842,11 @@ share/mysql/test/suite/perfschema/t/prepared_statements.test
 share/mysql/test/suite/perfschema/t/prepared_stmts_by_stored_programs.test
 share/mysql/test/suite/perfschema/t/privilege.test
 share/mysql/test/suite/perfschema/t/privilege_table_io.test
+share/mysql/test/suite/perfschema/t/processlist.test
+share/mysql/test/suite/perfschema/t/processlist_acl.test
+share/mysql/test/suite/perfschema/t/processlist_no_pfs-master.opt
+share/mysql/test/suite/perfschema/t/processlist_no_pfs.test
+share/mysql/test/suite/perfschema/t/processlist_port.test
 share/mysql/test/suite/perfschema/t/read_only.test
 share/mysql/test/suite/perfschema/t/relaylog-slave.opt
 share/mysql/test/suite/perfschema/t/relaylog.test
@@ -12849,6 +14044,8 @@ share/mysql/test/suite/perfschema/t/table_aggregate_thread_2u_2t.test
 share/mysql/test/suite/perfschema/t/table_aggregate_thread_2u_3t.test
 share/mysql/test/suite/perfschema/t/table_aggregate_thread_4u_2t.test
 share/mysql/test/suite/perfschema/t/table_aggregate_thread_4u_3t.test
+share/mysql/test/suite/perfschema/t/table_binary_log_transaction_compression_stats_basic.test
+share/mysql/test/suite/perfschema/t/table_binary_log_transaction_compression_stats_restart.test
 share/mysql/test/suite/perfschema/t/table_component-master.opt
 share/mysql/test/suite/perfschema/t/table_component.test
 share/mysql/test/suite/perfschema/t/table_component_binlog-master.opt
@@ -12880,6 +14077,7 @@ share/mysql/test/suite/perfschema/t/table_lock_aggregate_thread_2u_3t.test
 share/mysql/test/suite/perfschema/t/table_lock_aggregate_thread_4u_2t.test
 share/mysql/test/suite/perfschema/t/table_lock_aggregate_thread_4u_3t.test
 share/mysql/test/suite/perfschema/t/table_name.test
+share/mysql/test/suite/perfschema/t/table_name_myisam.test
 share/mysql/test/suite/perfschema/t/table_plugin-master.opt
 share/mysql/test/suite/perfschema/t/table_plugin.test
 share/mysql/test/suite/perfschema/t/table_plugin_early_load-master.opt
@@ -13042,6 +14240,8 @@ share/mysql/test/suite/rpl/include/rpl_row_event_max_size_show_binlog.inc
 share/mysql/test/suite/rpl/include/rpl_row_stages_validate.inc
 share/mysql/test/suite/rpl/include/rpl_with.inc
 share/mysql/test/suite/rpl/my.cnf
+share/mysql/test/suite/rpl/r/applier_compression.result
+share/mysql/test/suite/rpl/r/binlog_compression_semisync.result
 share/mysql/test/suite/rpl/r/default_row_format_01.result
 share/mysql/test/suite/rpl/r/rpl_0.result
 share/mysql/test/suite/rpl/r/rpl_000011.result
@@ -13064,12 +14264,15 @@ share/mysql/test/suite/rpl/r/rpl_auto_increment_bug45679_myisam.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_innodb.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_myisam.result
 share/mysql/test/suite/rpl/r/rpl_auto_increment_update_failure.result
+share/mysql/test/suite/rpl/r/rpl_autoextend_ddl.result
 share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
 share/mysql/test/suite/rpl/r/rpl_autoinc_lock_style.result
 share/mysql/test/suite/rpl/r/rpl_big_report_host.result
 share/mysql/test/suite/rpl/r/rpl_binlog_cache_encryption.result
 share/mysql/test/suite/rpl/r/rpl_binlog_cache_temp_file_encryption.result
 share/mysql/test/suite/rpl/r/rpl_binlog_cache_temp_file_encryption_myisam.result
+share/mysql/test/suite/rpl/r/rpl_binlog_compression.result
+share/mysql/test/suite/rpl/r/rpl_binlog_compression_require_row_format.result
 share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
 share/mysql/test/suite/rpl/r/rpl_binlog_failed_drop_table.result
 share/mysql/test/suite/rpl/r/rpl_binlog_failed_drop_table_myisam.result
@@ -13081,6 +14284,7 @@ share/mysql/test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking.result
 share/mysql/test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_filters.result
 share/mysql/test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_fk.result
 share/mysql/test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_indexes.result
+share/mysql/test/suite/rpl/r/rpl_binlog_transaction_dependency_tracking_with_invisible_columns.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
@@ -13089,13 +14293,16 @@ share/mysql/test/suite/rpl/r/rpl_bug33931.result
 share/mysql/test/suite/rpl/r/rpl_bug37426.result
 share/mysql/test/suite/rpl/r/rpl_bug38694.result
 share/mysql/test/suite/rpl/r/rpl_bug41902.result
+share/mysql/test/suite/rpl/r/rpl_caching_sha2_password_digest_rounds.result
 share/mysql/test/suite/rpl/r/rpl_cast.result
+share/mysql/test/suite/rpl/r/rpl_change_master_compress.result
 share/mysql/test/suite/rpl/r/rpl_change_master_dbug.result
 share/mysql/test/suite/rpl/r/rpl_change_master_open_temp_tables.result
 share/mysql/test/suite/rpl/r/rpl_change_master_to_master_delay.result
 share/mysql/test/suite/rpl/r/rpl_change_master_to_priv_checks_user_errors.result
 share/mysql/test/suite/rpl/r/rpl_change_master_to_priv_checks_user_syntax_and_pfs.result
 share/mysql/test/suite/rpl/r/rpl_change_master_to_require_row_format_syntax_and_pfs.result
+share/mysql/test/suite/rpl/r/rpl_change_master_to_require_table_primary_key_check.result
 share/mysql/test/suite/rpl/r/rpl_change_master_without_stopping_slave.result
 share/mysql/test/suite/rpl/r/rpl_charset.result
 share/mysql/test/suite/rpl/r/rpl_charset_sjis.result
@@ -13107,6 +14314,7 @@ share/mysql/test/suite/rpl/r/rpl_chg_rpl_filter.result
 share/mysql/test/suite/rpl/r/rpl_cloned_slave_relay_log_info.result
 share/mysql/test/suite/rpl/r/rpl_colSize.result
 share/mysql/test/suite/rpl/r/rpl_commit_after_flush.result
+share/mysql/test/suite/rpl/r/rpl_compression_extra.result
 share/mysql/test/suite/rpl/r/rpl_conditional_comments.result
 share/mysql/test/suite/rpl/r/rpl_connection.result
 share/mysql/test/suite/rpl/r/rpl_connection_compression.result
@@ -13118,6 +14326,7 @@ share/mysql/test/suite/rpl/r/rpl_crash_safe_master_myisam.result
 share/mysql/test/suite/rpl/r/rpl_crc_check.result
 share/mysql/test/suite/rpl/r/rpl_create_database.result
 share/mysql/test/suite/rpl/r/rpl_create_drop_temp_table.result
+share/mysql/test/suite/rpl/r/rpl_create_select_replay.result
 share/mysql/test/suite/rpl/r/rpl_critical_errors.result
 share/mysql/test/suite/rpl/r/rpl_critical_errors.result.txt
 share/mysql/test/suite/rpl/r/rpl_deadlock_globalsystemvariable_channelmap.result
@@ -13180,6 +14389,7 @@ share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock.result
 share/mysql/test/suite/rpl/r/rpl_group_commit_deadlock_myisam.result
 share/mysql/test/suite/rpl/r/rpl_group_replication_commands.result
 share/mysql/test/suite/rpl/r/rpl_group_replication_start_stop_gr_error.result
+share/mysql/test/suite/rpl/r/rpl_gtid_drop_mem_table.result
 share/mysql/test/suite/rpl/r/rpl_gtid_empty_transaction.result
 share/mysql/test/suite/rpl/r/rpl_gtid_events.result
 share/mysql/test/suite/rpl/r/rpl_gtid_failover.result
@@ -13205,9 +14415,11 @@ share/mysql/test/suite/rpl/r/rpl_initialize_serverid.result
 share/mysql/test/suite/rpl/r/rpl_innodb_auto_increment.result
 share/mysql/test/suite/rpl/r/rpl_innodb_bug28430.result
 share/mysql/test/suite/rpl/r/rpl_innodb_bug30888.result
+share/mysql/test/suite/rpl/r/rpl_innodb_doublewrite_dir_01.result
 share/mysql/test/suite/rpl/r/rpl_innodb_info_tbl_slave_tmp_tbl_mismatch.result
 share/mysql/test/suite/rpl/r/rpl_innodb_mixed_ddl.result
 share/mysql/test/suite/rpl/r/rpl_innodb_mixed_dml.result
+share/mysql/test/suite/rpl/r/rpl_innodb_redo_log.result
 share/mysql/test/suite/rpl/r/rpl_insert_id.result
 share/mysql/test/suite/rpl/r/rpl_insert_id_pk.result
 share/mysql/test/suite/rpl/r/rpl_insert_ignore.result
@@ -13217,8 +14429,10 @@ share/mysql/test/suite/rpl/r/rpl_instant_add_column.result
 share/mysql/test/suite/rpl/r/rpl_invalid_mem_access_with_rows_query_log_event.result
 share/mysql/test/suite/rpl/r/rpl_invalid_replication_timestamps.result
 share/mysql/test/suite/rpl/r/rpl_invalid_replication_timestamps_multi_source.result
+share/mysql/test/suite/rpl/r/rpl_invisible_columns.result
 share/mysql/test/suite/rpl/r/rpl_invisible_indexes.result
 share/mysql/test/suite/rpl/r/rpl_invisible_indexes_myisam.result
+share/mysql/test/suite/rpl/r/rpl_invisible_indexes_row.result
 share/mysql/test/suite/rpl/r/rpl_io_thd_blocked_show_slave_status.result
 share/mysql/test/suite/rpl/r/rpl_io_thd_wait_for_disk_space.result
 share/mysql/test/suite/rpl/r/rpl_io_thd_wait_for_disk_space_stress.result
@@ -13245,7 +14459,9 @@ share/mysql/test/suite/rpl/r/rpl_locale.result
 share/mysql/test/suite/rpl/r/rpl_lock_backup_binary_and_relay_logs.result
 share/mysql/test/suite/rpl/r/rpl_lock_for_backup_blocks_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_log_info_repository_persistence.result
+share/mysql/test/suite/rpl/r/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.result
 share/mysql/test/suite/rpl/r/rpl_log_info_repository_persistence_require_row.result
+share/mysql/test/suite/rpl/r/rpl_log_info_repository_persistence_require_table_primary_key_check.result
 share/mysql/test/suite/rpl/r/rpl_long_invoker_hostname.result
 share/mysql/test/suite/rpl/r/rpl_lost_events_on_rotate.result
 share/mysql/test/suite/rpl/r/rpl_many_optimize.result
@@ -13290,6 +14506,8 @@ share/mysql/test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_xa_prepare.resu
 share/mysql/test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_xa_prepare_nobinlog.result
 share/mysql/test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_xa_rollback.result
 share/mysql/test/suite/rpl/r/rpl_mts_slave_preserve_commit_order_xa_rollback_nobinlog.result
+share/mysql/test/suite/rpl/r/rpl_mts_spco_deadlock_hang_on_non_temp_error.result
+share/mysql/test/suite/rpl/r/rpl_mts_spco_deadlock_slave_trans_retries_hang.result
 share/mysql/test/suite/rpl/r/rpl_mts_spco_xa_prepare_error_nobinlog.result
 share/mysql/test/suite/rpl/r/rpl_mts_stop_slave.result
 share/mysql/test/suite/rpl/r/rpl_mts_stop_slave_report_pos.result
@@ -13330,6 +14548,7 @@ share/mysql/test/suite/rpl/r/rpl_non_atomic_ddl.result
 share/mysql/test/suite/rpl/r/rpl_nondeterministic_functions.result
 share/mysql/test/suite/rpl/r/rpl_not_null_innodb.result
 share/mysql/test/suite/rpl/r/rpl_not_null_myisam.result
+share/mysql/test/suite/rpl/r/rpl_null_pending_rows_event.result
 share/mysql/test/suite/rpl/r/rpl_oom_creating_temp_table_for_conversion_error.result
 share/mysql/test/suite/rpl/r/rpl_open_temp_tables_warning.result
 share/mysql/test/suite/rpl/r/rpl_operation_ignore_super_read_only.result
@@ -13395,16 +14614,20 @@ share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
 share/mysql/test/suite/rpl/r/rpl_relayrotate.result
 share/mysql/test/suite/rpl/r/rpl_relayspace.result
 share/mysql/test/suite/rpl/r/rpl_rename_index.result
+share/mysql/test/suite/rpl/r/rpl_replica_stored_generated_columns.result
+share/mysql/test/suite/rpl/r/rpl_replica_terminology.result
 share/mysql/test/suite/rpl/r/rpl_replicate_event_after_sync_stage.result
 share/mysql/test/suite/rpl/r/rpl_replicate_rewrite_db.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_before_dml.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_channels_initialization.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_io.result
+share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_ongoing_transaction.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_server_startup.result
 share/mysql/test/suite/rpl/r/rpl_replication_observers_example_plugin_server_startup_win.result
 share/mysql/test/suite/rpl/r/rpl_report.result
 share/mysql/test/suite/rpl/r/rpl_report_port.result
+share/mysql/test/suite/rpl/r/rpl_require_table_primary_key_check_behavior.result
 share/mysql/test/suite/rpl/r/rpl_reset_slave_all.result
 share/mysql/test/suite/rpl/r/rpl_reset_slave_fail.result
 share/mysql/test/suite/rpl/r/rpl_rewrite_db_filter.result
@@ -13437,6 +14660,7 @@ share/mysql/test/suite/rpl/r/rpl_row_func002.result
 share/mysql/test/suite/rpl/r/rpl_row_func003.result
 share/mysql/test/suite/rpl/r/rpl_row_hash_scan_sanity.result
 share/mysql/test/suite/rpl/r/rpl_row_idempotency.result
+share/mysql/test/suite/rpl/r/rpl_row_image_check_for_insert_select.result
 share/mysql/test/suite/rpl/r/rpl_row_img_blobs.result
 share/mysql/test/suite/rpl/r/rpl_row_img_eng_min.result
 share/mysql/test/suite/rpl/r/rpl_row_img_eng_noblob.result
@@ -13446,6 +14670,7 @@ share/mysql/test/suite/rpl/r/rpl_row_img_idx_noblob.result
 share/mysql/test/suite/rpl/r/rpl_row_img_misc.result
 share/mysql/test/suite/rpl/r/rpl_row_img_sanity.result
 share/mysql/test/suite/rpl/r/rpl_row_inexist_tbl.result
+share/mysql/test/suite/rpl/r/rpl_row_invisible_columns.result
 share/mysql/test/suite/rpl/r/rpl_row_json_null_for_not_null.result
 share/mysql/test/suite/rpl/r/rpl_row_jsondiff_basic_nokey.result
 share/mysql/test/suite/rpl/r/rpl_row_jsondiff_basic_pk.result
@@ -13504,6 +14729,7 @@ share/mysql/test/suite/rpl/r/rpl_seconds_behind_master_mts.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_add_remove_slaves.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_event.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync_slave_compressed_protocol.result
+share/mysql/test/suite/rpl/r/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.result
 share/mysql/test/suite/rpl/r/rpl_sequential.result
 share/mysql/test/suite/rpl/r/rpl_server_id.result
 share/mysql/test/suite/rpl/r/rpl_server_id_ignore.result
@@ -13514,6 +14740,7 @@ share/mysql/test/suite/rpl/r/rpl_set_null_innodb.result
 share/mysql/test/suite/rpl/r/rpl_set_null_myisam.result
 share/mysql/test/suite/rpl/r/rpl_show_errors.result
 share/mysql/test/suite/rpl/r/rpl_show_master_info_file.result
+share/mysql/test/suite/rpl/r/rpl_show_processlist_info.result
 share/mysql/test/suite/rpl/r/rpl_show_relaylog_events.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_hosts.result
 share/mysql/test/suite/rpl/r/rpl_show_slave_running.result
@@ -13630,6 +14857,10 @@ share/mysql/test/suite/rpl/r/rpl_xa_with_filters_binlogless_slave.result
 share/mysql/test/suite/rpl/r/rpl_xa_xplugin.result
 share/mysql/test/suite/rpl/r/rpl_zombie_dump_threads.result
 share/mysql/test/suite/rpl/rpl_1slave_base.cnf
+share/mysql/test/suite/rpl/t/applier_compression.test
+share/mysql/test/suite/rpl/t/binlog_compression_semisync-master.opt
+share/mysql/test/suite/rpl/t/binlog_compression_semisync-slave.opt
+share/mysql/test/suite/rpl/t/binlog_compression_semisync.test
 share/mysql/test/suite/rpl/t/default_row_format_01.test
 share/mysql/test/suite/rpl/t/rpl_0.test
 share/mysql/test/suite/rpl/t/rpl_000011.test
@@ -13658,6 +14889,7 @@ share/mysql/test/suite/rpl/t/rpl_auto_increment_bug45679_myisam.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_innodb.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_myisam.test
 share/mysql/test/suite/rpl/t/rpl_auto_increment_update_failure.test
+share/mysql/test/suite/rpl/t/rpl_autoextend_ddl.test
 share/mysql/test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
 share/mysql/test/suite/rpl/t/rpl_autoinc_lock_style.test
 share/mysql/test/suite/rpl/t/rpl_big_report_host-slave.opt
@@ -13667,6 +14899,8 @@ share/mysql/test/suite/rpl/t/rpl_binlog_cache_temp_file_encryption-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_cache_temp_file_encryption.test
 share/mysql/test/suite/rpl/t/rpl_binlog_cache_temp_file_encryption_myisam-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_cache_temp_file_encryption_myisam.test
+share/mysql/test/suite/rpl/t/rpl_binlog_compression.test
+share/mysql/test/suite/rpl/t/rpl_binlog_compression_require_row_format.test
 share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_errors.test
 share/mysql/test/suite/rpl/t/rpl_binlog_failed_drop_table-slave.opt
@@ -13683,6 +14917,7 @@ share/mysql/test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fil
 share/mysql/test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_fk.test
 share/mysql/test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_indexes.test
+share/mysql/test/suite/rpl/t/rpl_binlog_transaction_dependency_tracking_with_invisible_columns.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
@@ -13694,7 +14929,11 @@ share/mysql/test/suite/rpl/t/rpl_bug38694-slave.opt
 share/mysql/test/suite/rpl/t/rpl_bug38694.test
 share/mysql/test/suite/rpl/t/rpl_bug41902-slave.opt
 share/mysql/test/suite/rpl/t/rpl_bug41902.test
+share/mysql/test/suite/rpl/t/rpl_caching_sha2_password_digest_rounds-master.opt
+share/mysql/test/suite/rpl/t/rpl_caching_sha2_password_digest_rounds-slave.opt
+share/mysql/test/suite/rpl/t/rpl_caching_sha2_password_digest_rounds.test
 share/mysql/test/suite/rpl/t/rpl_cast.test
+share/mysql/test/suite/rpl/t/rpl_change_master_compress.test
 share/mysql/test/suite/rpl/t/rpl_change_master_dbug.test
 share/mysql/test/suite/rpl/t/rpl_change_master_open_temp_tables.test
 share/mysql/test/suite/rpl/t/rpl_change_master_to_master_delay.test
@@ -13703,6 +14942,8 @@ share/mysql/test/suite/rpl/t/rpl_change_master_to_priv_checks_user_syntax_and_pf
 share/mysql/test/suite/rpl/t/rpl_change_master_to_priv_checks_user_syntax_and_pfs.test
 share/mysql/test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.cnf
 share/mysql/test/suite/rpl/t/rpl_change_master_to_require_row_format_syntax_and_pfs.test
+share/mysql/test/suite/rpl/t/rpl_change_master_to_require_table_primary_key_check.cnf
+share/mysql/test/suite/rpl/t/rpl_change_master_to_require_table_primary_key_check.test
 share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave-master.opt
 share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave-slave.opt
 share/mysql/test/suite/rpl/t/rpl_change_master_without_stopping_slave.test
@@ -13720,6 +14961,7 @@ share/mysql/test/suite/rpl/t/rpl_cloned_slave_relay_log_info.cnf
 share/mysql/test/suite/rpl/t/rpl_cloned_slave_relay_log_info.test
 share/mysql/test/suite/rpl/t/rpl_colSize.test
 share/mysql/test/suite/rpl/t/rpl_commit_after_flush.test
+share/mysql/test/suite/rpl/t/rpl_compression_extra.test
 share/mysql/test/suite/rpl/t/rpl_conditional_comments.test
 share/mysql/test/suite/rpl/t/rpl_connection.test
 share/mysql/test/suite/rpl/t/rpl_connection_compression.test
@@ -13736,6 +14978,7 @@ share/mysql/test/suite/rpl/t/rpl_create_database-master.opt
 share/mysql/test/suite/rpl/t/rpl_create_database-slave.opt
 share/mysql/test/suite/rpl/t/rpl_create_database.test
 share/mysql/test/suite/rpl/t/rpl_create_drop_temp_table.test
+share/mysql/test/suite/rpl/t/rpl_create_select_replay.test
 share/mysql/test/suite/rpl/t/rpl_critical_errors.test
 share/mysql/test/suite/rpl/t/rpl_deadlock_globalsystemvariable_channelmap-master.opt
 share/mysql/test/suite/rpl/t/rpl_deadlock_globalsystemvariable_channelmap-slave.opt
@@ -13829,6 +15072,8 @@ share/mysql/test/suite/rpl/t/rpl_group_commit_deadlock_myisam.test
 share/mysql/test/suite/rpl/t/rpl_group_replication_commands.test
 share/mysql/test/suite/rpl/t/rpl_group_replication_start_stop_gr_error-master.opt
 share/mysql/test/suite/rpl/t/rpl_group_replication_start_stop_gr_error.test
+share/mysql/test/suite/rpl/t/rpl_gtid_drop_mem_table.cnf
+share/mysql/test/suite/rpl/t/rpl_gtid_drop_mem_table.test
 share/mysql/test/suite/rpl/t/rpl_gtid_empty_transaction.cnf
 share/mysql/test/suite/rpl/t/rpl_gtid_empty_transaction.test
 share/mysql/test/suite/rpl/t/rpl_gtid_events.test
@@ -13881,10 +15126,16 @@ share/mysql/test/suite/rpl/t/rpl_innodb_bug28430-master.opt
 share/mysql/test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
 share/mysql/test/suite/rpl/t/rpl_innodb_bug28430.test
 share/mysql/test/suite/rpl/t/rpl_innodb_bug30888.test
+share/mysql/test/suite/rpl/t/rpl_innodb_doublewrite_dir_01-master.opt
+share/mysql/test/suite/rpl/t/rpl_innodb_doublewrite_dir_01-slave.opt
+share/mysql/test/suite/rpl/t/rpl_innodb_doublewrite_dir_01.test
 share/mysql/test/suite/rpl/t/rpl_innodb_info_tbl_slave_tmp_tbl_mismatch.test
 share/mysql/test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 share/mysql/test/suite/rpl/t/rpl_innodb_mixed_dml-master.opt
 share/mysql/test/suite/rpl/t/rpl_innodb_mixed_dml.test
+share/mysql/test/suite/rpl/t/rpl_innodb_redo_log-master.opt
+share/mysql/test/suite/rpl/t/rpl_innodb_redo_log-slave.opt
+share/mysql/test/suite/rpl/t/rpl_innodb_redo_log.test
 share/mysql/test/suite/rpl/t/rpl_insert_id.test
 share/mysql/test/suite/rpl/t/rpl_insert_id_pk.test
 share/mysql/test/suite/rpl/t/rpl_insert_ignore.test
@@ -13895,8 +15146,11 @@ share/mysql/test/suite/rpl/t/rpl_invalid_mem_access_with_rows_query_log_event.te
 share/mysql/test/suite/rpl/t/rpl_invalid_replication_timestamps.test
 share/mysql/test/suite/rpl/t/rpl_invalid_replication_timestamps_multi_source.cnf
 share/mysql/test/suite/rpl/t/rpl_invalid_replication_timestamps_multi_source.test
+share/mysql/test/suite/rpl/t/rpl_invisible_columns.test
 share/mysql/test/suite/rpl/t/rpl_invisible_indexes.test
 share/mysql/test/suite/rpl/t/rpl_invisible_indexes_myisam.test
+share/mysql/test/suite/rpl/t/rpl_invisible_indexes_row-master.opt
+share/mysql/test/suite/rpl/t/rpl_invisible_indexes_row.test
 share/mysql/test/suite/rpl/t/rpl_io_thd_blocked_show_slave_status.test
 share/mysql/test/suite/rpl/t/rpl_io_thd_wait_for_disk_space.test
 share/mysql/test/suite/rpl/t/rpl_io_thd_wait_for_disk_space_stress-slave.opt
@@ -13947,8 +15201,13 @@ share/mysql/test/suite/rpl/t/rpl_lock_backup_binary_and_relay_logs.test
 share/mysql/test/suite/rpl/t/rpl_lock_for_backup_blocks_stop_slave.test
 share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence-slave.opt
 share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence.test
+share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions-master.opt
+share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions-slave.opt
+share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_assign_gtids_to_anonymous_transactions.test
 share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_require_row-slave.opt
 share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_require_row.test
+share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check-slave.opt
+share/mysql/test/suite/rpl/t/rpl_log_info_repository_persistence_require_table_primary_key_check.test
 share/mysql/test/suite/rpl/t/rpl_long_invoker_hostname.test
 share/mysql/test/suite/rpl/t/rpl_lost_events_on_rotate.test
 share/mysql/test/suite/rpl/t/rpl_many_optimize.test
@@ -14018,6 +15277,8 @@ share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_xa_prepare_nobi
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_xa_rollback.test
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_xa_rollback_nobinlog-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_slave_preserve_commit_order_xa_rollback_nobinlog.test
+share/mysql/test/suite/rpl/t/rpl_mts_spco_deadlock_hang_on_non_temp_error.test
+share/mysql/test/suite/rpl/t/rpl_mts_spco_deadlock_slave_trans_retries_hang.test
 share/mysql/test/suite/rpl/t/rpl_mts_spco_xa_prepare_error_nobinlog-slave.opt
 share/mysql/test/suite/rpl/t/rpl_mts_spco_xa_prepare_error_nobinlog.test
 share/mysql/test/suite/rpl/t/rpl_mts_stop_slave-slave.opt
@@ -14081,6 +15342,7 @@ share/mysql/test/suite/rpl/t/rpl_non_atomic_ddl.test
 share/mysql/test/suite/rpl/t/rpl_nondeterministic_functions.test
 share/mysql/test/suite/rpl/t/rpl_not_null_innodb.test
 share/mysql/test/suite/rpl/t/rpl_not_null_myisam.test
+share/mysql/test/suite/rpl/t/rpl_null_pending_rows_event.test
 share/mysql/test/suite/rpl/t/rpl_oom_creating_temp_table_for_conversion_error-slave.opt
 share/mysql/test/suite/rpl/t/rpl_oom_creating_temp_table_for_conversion_error.test
 share/mysql/test/suite/rpl/t/rpl_open_temp_tables_warning.test
@@ -14190,6 +15452,8 @@ share/mysql/test/suite/rpl/t/rpl_relayrotate.test
 share/mysql/test/suite/rpl/t/rpl_relayspace-slave.opt
 share/mysql/test/suite/rpl/t/rpl_relayspace.test
 share/mysql/test/suite/rpl/t/rpl_rename_index.test
+share/mysql/test/suite/rpl/t/rpl_replica_stored_generated_columns.test
+share/mysql/test/suite/rpl/t/rpl_replica_terminology.test
 share/mysql/test/suite/rpl/t/rpl_replicate_event_after_sync_stage.test
 share/mysql/test/suite/rpl/t/rpl_replicate_rewrite_db.test
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_before_dml-master.opt
@@ -14202,6 +15466,8 @@ share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_channels_i
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_io-master.opt
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_io-slave.opt
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_io.test
+share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction-master.opt
+share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_ongoing_transaction.test
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_server_startup-master.opt
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_server_startup.test
 share/mysql/test/suite/rpl/t/rpl_replication_observers_example_plugin_server_startup_win-master.opt
@@ -14210,6 +15476,7 @@ share/mysql/test/suite/rpl/t/rpl_report-slave.opt
 share/mysql/test/suite/rpl/t/rpl_report.test
 share/mysql/test/suite/rpl/t/rpl_report_port-master.opt
 share/mysql/test/suite/rpl/t/rpl_report_port.test
+share/mysql/test/suite/rpl/t/rpl_require_table_primary_key_check_behavior.test
 share/mysql/test/suite/rpl/t/rpl_reset_slave_all.test
 share/mysql/test/suite/rpl/t/rpl_reset_slave_fail.test
 share/mysql/test/suite/rpl/t/rpl_rewrite_db_filter-master.opt
@@ -14255,6 +15522,7 @@ share/mysql/test/suite/rpl/t/rpl_row_func002.test
 share/mysql/test/suite/rpl/t/rpl_row_func003.test
 share/mysql/test/suite/rpl/t/rpl_row_hash_scan_sanity.test
 share/mysql/test/suite/rpl/t/rpl_row_idempotency.test
+share/mysql/test/suite/rpl/t/rpl_row_image_check_for_insert_select.test
 share/mysql/test/suite/rpl/t/rpl_row_img.cnf
 share/mysql/test/suite/rpl/t/rpl_row_img_blobs.cnf
 share/mysql/test/suite/rpl/t/rpl_row_img_blobs.test
@@ -14271,6 +15539,7 @@ share/mysql/test/suite/rpl/t/rpl_row_img_idx_noblob.test
 share/mysql/test/suite/rpl/t/rpl_row_img_misc.test
 share/mysql/test/suite/rpl/t/rpl_row_img_sanity.test
 share/mysql/test/suite/rpl/t/rpl_row_inexist_tbl.test
+share/mysql/test/suite/rpl/t/rpl_row_invisible_columns.test
 share/mysql/test/suite/rpl/t/rpl_row_json_null_for_not_null.test
 share/mysql/test/suite/rpl/t/rpl_row_jsondiff.cnf
 share/mysql/test/suite/rpl/t/rpl_row_jsondiff_basic.cnf
@@ -14351,6 +15620,10 @@ share/mysql/test/suite/rpl/t/rpl_semi_sync_event.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_turn_on_off_optimize_for_static_plugin_config-master.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config-slave.opt
+share/mysql/test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.cnf
+share/mysql/test/suite/rpl/t/rpl_semi_sync_turn_on_off_optimize_for_static_plugin_config.test
 share/mysql/test/suite/rpl/t/rpl_sequential-master.opt
 share/mysql/test/suite/rpl/t/rpl_sequential-slave.opt
 share/mysql/test/suite/rpl/t/rpl_sequential.test
@@ -14368,6 +15641,7 @@ share/mysql/test/suite/rpl/t/rpl_show_errors.test
 share/mysql/test/suite/rpl/t/rpl_show_master_info_file-master.opt
 share/mysql/test/suite/rpl/t/rpl_show_master_info_file-slave.opt
 share/mysql/test/suite/rpl/t/rpl_show_master_info_file.test
+share/mysql/test/suite/rpl/t/rpl_show_processlist_info.test
 share/mysql/test/suite/rpl/t/rpl_show_relaylog_events.test
 share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.cnf
 share/mysql/test/suite/rpl/t/rpl_show_slave_hosts.test
@@ -14397,7 +15671,6 @@ share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-master.opt
 share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
 share/mysql/test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
 share/mysql/test/suite/rpl/t/rpl_slave_register_coverage.test
-share/mysql/test/suite/rpl/t/rpl_slave_require_row_format_basics_io-slave.opt
 share/mysql/test/suite/rpl/t/rpl_slave_require_row_format_basics_io.test
 share/mysql/test/suite/rpl/t/rpl_slave_start.test
 share/mysql/test/suite/rpl/t/rpl_slave_start_after_clone-master.opt
@@ -14540,6 +15813,16 @@ share/mysql/test/suite/rpl/t/rpl_zombie_dump_threads.test
 share/mysql/test/suite/rpl_gtid/combinations
 share/mysql/test/suite/rpl_gtid/my.cnf
 share/mysql/test/suite/rpl_gtid/r/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_auto_failover_highest_weight.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_checks.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_interim_add_sender.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_managed_udf_check.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_perfschema.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_restart.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_stop.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_check.result
+share/mysql/test/suite/rpl_gtid/r/rpl_async_conn_failover_udf_register_error.result
 share/mysql/test/suite/rpl_gtid/r/rpl_atomic_ddl_binlogless.result
 share/mysql/test/suite/rpl_gtid/r/rpl_atomic_ddl_rollback.result
 share/mysql/test/suite/rpl_gtid/r/rpl_atomic_ddl_rollback_slave_skip_error.result
@@ -14552,9 +15835,11 @@ share/mysql/test/suite/rpl_gtid/r/rpl_drop_temp_gtid.result
 share/mysql/test/suite/rpl_gtid/r/rpl_empty_multi_update.result
 share/mysql/test/suite/rpl_gtid/r/rpl_explicit_modify_gtid_table.result
 share/mysql/test/suite/rpl_gtid/r/rpl_group_commit_update_commit_group.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_atomic_cross_repl.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_binary_log_as_relay_log.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_compress_thd_ignore_super_read_only.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_create_select.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_delete_memory_table_after_start_server.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_deleted_binlog_fail_to_connect.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_deprecations.result
@@ -14568,12 +15853,15 @@ share/mysql/test/suite/rpl_gtid/r/rpl_gtid_heartbeat_2slave.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_huge_gtid_set.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_ignore_table_filter_insensitive.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_ignore_table_filter_sensitive.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_incident_event_cache_failure.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_loaddata_s.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mem_leak_with_skipped_rows_query_log_event.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mixed_row_create_drop_temporary_in_function_or_trigger.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.result
-share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mixed_stm_create_drop_temporary_in_function_or_trigger.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mts_replicate_same_server_id.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mts_spco_deadlock_other_locks.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mts_spco_deadlock_other_locks_retries.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_mysqlbinlog_rotate.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_parallel.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_perfschema_applier_xa_status.result
@@ -14583,7 +15871,6 @@ share/mysql/test/suite/rpl_gtid/r/rpl_gtid_purged_settable.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_replay_relaylog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_retrieve_last_trx.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_retrieve_last_trx_myisam.result
-share/mysql/test/suite/rpl_gtid/r/rpl_gtid_row_create_drop_temporary_in_function_or_trigger.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_row_event_max_size.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_row_mix_drop_table.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_server_sighup.result
@@ -14595,6 +15882,7 @@ share/mysql/test/suite/rpl_gtid/r/rpl_gtid_spanned_trx.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_split_statements.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_split_statements_debug.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_sql_until_before_after.result
+share/mysql/test/suite/rpl_gtid/r/rpl_gtid_stm_create_drop_temporary_in_function_or_trigger.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_stm_drop_table.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_table_repository_split_trx.result
 share/mysql/test/suite/rpl_gtid/r/rpl_gtid_transaction_split_across_relay_logs.result
@@ -14607,8 +15895,7 @@ share/mysql/test/suite/rpl_gtid/r/rpl_line_topology_block_receiver.result
 share/mysql/test/suite/rpl_gtid/r/rpl_low_slave_net_time_out.result
 share/mysql/test/suite/rpl_gtid/r/rpl_master_errors.result
 share/mysql/test/suite/rpl_gtid/r/rpl_master_pos_wait_after_startup.result
-share/mysql/test/suite/rpl_gtid/r/rpl_mixed_stm_dml_drop_on_temporary_table_in_function.result
-share/mysql/test/suite/rpl_gtid/r/rpl_mixed_stm_drop_temporary_table_in_function.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mixed_temp_table_stored_function.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_execute_partial_trx_with_auto_pos_off.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_execute_partial_trx_with_auto_pos_on.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_execute_partial_trx_with_auto_pos_on_binlogless_slave.result
@@ -14625,10 +15912,14 @@ share/mysql/test/suite/rpl_gtid/r/rpl_mts_slave_preserve_commit_order_xa_commit_
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_slave_preserve_commit_order_xa_prepare_gtid_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_slave_preserve_commit_order_xa_rollback_error.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_slave_preserve_commit_order_xa_rollback_error_nobinlog.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_acl_commands_binlog.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_acl_commands_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_algo_copy_binlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_algo_copy_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_analyze_partition.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_analyze_partition_nobinlog.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_commands_binlog.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_commands_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_generated_columns_binlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_alter_table_generated_columns_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_check_worker_states_binlog.result
@@ -14638,6 +15929,7 @@ share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_commands_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_partition_commands_binlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_spco_partition_commands_nobinlog.result
 share/mysql/test/suite/rpl_gtid/r/rpl_mts_until.result
+share/mysql/test/suite/rpl_gtid/r/rpl_mts_xa_retry.result
 share/mysql/test/suite/rpl_gtid/r/rpl_multi_source_block_receiver.result
 share/mysql/test/suite/rpl_gtid/r/rpl_multi_source_mtr_includes.result
 share/mysql/test/suite/rpl_gtid/r/rpl_multi_source_timestamps.result
@@ -14663,12 +15955,15 @@ share/mysql/test/suite/rpl_gtid/r/rpl_rotate_gtid.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sbm_previous_gtid_event.result
 share/mysql/test/suite/rpl_gtid/r/rpl_server_version_line_topology.result
 share/mysql/test/suite/rpl_gtid/r/rpl_server_version_multi_source.result
+share/mysql/test/suite/rpl_gtid/r/rpl_set_gtid_purge_on_sp.result
 share/mysql/test/suite/rpl_gtid/r/rpl_simulate_create_chunk_failure.result
+share/mysql/test/suite/rpl_gtid/r/rpl_source_terminology.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sql_delay.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sql_delay_line_topology.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sql_delay_multi_source.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sql_delay_multiple.result
 share/mysql/test/suite/rpl_gtid/r/rpl_statement_create_drop_temporary_in_transaction.result
+share/mysql/test/suite/rpl_gtid/r/rpl_stm_drop_temporary_table_in_function.result
 share/mysql/test/suite/rpl_gtid/r/rpl_stm_until_pos_middle_gtid.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sync_relay_log_info.result
 share/mysql/test/suite/rpl_gtid/r/rpl_sync_relay_log_info_myisam.result
@@ -14691,6 +15986,21 @@ share/mysql/test/suite/rpl_gtid/r/rpl_xa_prepare.result
 share/mysql/test/suite/rpl_gtid/r/rpl_xa_with_filters_error_msg.result
 share/mysql/test/suite/rpl_gtid/rpl_1slave_base.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_apply_binlog_with_anonymous_gtid_when_gtid_mode_on.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_auto_failover_highest_weight.cnf
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_auto_failover_highest_weight.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover.cnf
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_checks.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_interim_add_sender.cnf
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_interim_add_sender.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_managed_udf_check.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_perfschema.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.cnf
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_restart.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_stop.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_check.test
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error-master.opt
+share/mysql/test/suite/rpl_gtid/t/rpl_async_conn_failover_udf_register_error.test
 share/mysql/test/suite/rpl_gtid/t/rpl_atomic_ddl_binlogless-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_atomic_ddl_binlogless.test
 share/mysql/test/suite/rpl_gtid/t/rpl_atomic_ddl_rollback.test
@@ -14709,10 +16019,12 @@ share/mysql/test/suite/rpl_gtid/t/rpl_empty_multi_update.test
 share/mysql/test/suite/rpl_gtid/t/rpl_explicit_modify_gtid_table-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_explicit_modify_gtid_table.test
 share/mysql/test/suite/rpl_gtid/t/rpl_group_commit_update_commit_group.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_assign_gtid_to_anonymous_transactions_with_master_gtid_mode_on.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_atomic_cross_repl.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_binary_log_as_relay_log.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_compress_thd_ignore_super_read_only-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_compress_thd_ignore_super_read_only.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_create_select.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_delete_memory_table_after_start_server.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_deleted_binlog_fail_to_connect.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_deprecations.test
@@ -14736,16 +16048,19 @@ share/mysql/test/suite/rpl_gtid/t/rpl_gtid_ignore_table_filter_insensitive-slave
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_ignore_table_filter_insensitive.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_ignore_table_filter_sensitive-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_ignore_table_filter_sensitive.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_incident_event_cache_failure.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_loaddata_s-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_loaddata_s.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mem_leak_with_skipped_rows_query_log_event.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mixed_row_create_drop_temporary_in_function_or_trigger.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mixed_rows_and_stmts_tx_isolation_error.test
-share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mixed_stm_create_drop_temporary_in_function_or_trigger.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_relay_log_recovery_auto_pos_on_off.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_replicate_same_server_id.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_spco_deadlock_other_locks.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mts_spco_deadlock_other_locks_retries.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_mysqlbinlog_rotate.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_parallel.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_perfschema_applier_xa_status-master.opt
@@ -14761,7 +16076,6 @@ share/mysql/test/suite/rpl_gtid/t/rpl_gtid_purged_settable.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_replay_relaylog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_retrieve_last_trx.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_retrieve_last_trx_myisam.test
-share/mysql/test/suite/rpl_gtid/t/rpl_gtid_row_create_drop_temporary_in_function_or_trigger.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_row_event_max_size-master.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_row_event_max_size-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_row_event_max_size.test
@@ -14778,6 +16092,7 @@ share/mysql/test/suite/rpl_gtid/t/rpl_gtid_spanned_trx.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_split_statements.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_split_statements_debug.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_sql_until_before_after.test
+share/mysql/test/suite/rpl_gtid/t/rpl_gtid_stm_create_drop_temporary_in_function_or_trigger.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_stm_drop_table.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_stm_drop_table.test
 share/mysql/test/suite/rpl_gtid/t/rpl_gtid_table_repository_split_trx-slave.opt
@@ -14796,8 +16111,7 @@ share/mysql/test/suite/rpl_gtid/t/rpl_line_topology_block_receiver.test
 share/mysql/test/suite/rpl_gtid/t/rpl_low_slave_net_time_out.test
 share/mysql/test/suite/rpl_gtid/t/rpl_master_errors.test
 share/mysql/test/suite/rpl_gtid/t/rpl_master_pos_wait_after_startup.test
-share/mysql/test/suite/rpl_gtid/t/rpl_mixed_stm_dml_drop_on_temporary_table_in_function.test
-share/mysql/test/suite/rpl_gtid/t/rpl_mixed_stm_drop_temporary_table_in_function.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mixed_temp_table_stored_function.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_off.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_execute_partial_trx_with_auto_pos_on-slave.opt
@@ -14827,12 +16141,20 @@ share/mysql/test/suite/rpl_gtid/t/rpl_mts_slave_preserve_commit_order_xa_prepare
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_slave_preserve_commit_order_xa_rollback_error.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_slave_preserve_commit_order_xa_rollback_error_nobinlog-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_slave_preserve_commit_order_xa_rollback_error_nobinlog.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_acl_commands_binlog-slave.opt
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_acl_commands_binlog.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_acl_commands_nobinlog-slave.opt
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_acl_commands_nobinlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_algo_copy_binlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_algo_copy_nobinlog-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_algo_copy_nobinlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_analyze_partition.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_analyze_partition_nobinlog-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_analyze_partition_nobinlog.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_commands_binlog-slave.opt
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_commands_binlog.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_commands_nobinlog-slave.opt
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_commands_nobinlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_generated_columns_binlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_generated_columns_nobinlog-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_alter_table_generated_columns_nobinlog.test
@@ -14849,6 +16171,7 @@ share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_partition_commands_binlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_partition_commands_nobinlog-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_spco_partition_commands_nobinlog.test
 share/mysql/test/suite/rpl_gtid/t/rpl_mts_until.test
+share/mysql/test/suite/rpl_gtid/t/rpl_mts_xa_retry.test
 share/mysql/test/suite/rpl_gtid/t/rpl_multi_source_block_receiver.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_multi_source_block_receiver.test
 share/mysql/test/suite/rpl_gtid/t/rpl_multi_source_mtr_includes.test
@@ -14888,8 +16211,10 @@ share/mysql/test/suite/rpl_gtid/t/rpl_server_version_line_topology.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_server_version_line_topology.test
 share/mysql/test/suite/rpl_gtid/t/rpl_server_version_multi_source.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_server_version_multi_source.test
+share/mysql/test/suite/rpl_gtid/t/rpl_set_gtid_purge_on_sp.test
 share/mysql/test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_simulate_create_chunk_failure.test
+share/mysql/test/suite/rpl_gtid/t/rpl_source_terminology.test
 share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay.test
 share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay_line_topology.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay_line_topology.test
@@ -14898,6 +16223,7 @@ share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay_multi_source.test
 share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay_multiple.cnf
 share/mysql/test/suite/rpl_gtid/t/rpl_sql_delay_multiple.test
 share/mysql/test/suite/rpl_gtid/t/rpl_statement_create_drop_temporary_in_transaction.test
+share/mysql/test/suite/rpl_gtid/t/rpl_stm_drop_temporary_table_in_function.test
 share/mysql/test/suite/rpl_gtid/t/rpl_stm_until_pos_middle_gtid.test
 share/mysql/test/suite/rpl_gtid/t/rpl_sync_relay_log_info-slave.opt
 share/mysql/test/suite/rpl_gtid/t/rpl_sync_relay_log_info.test
@@ -14986,6 +16312,10 @@ share/mysql/test/suite/rpl_nogtid/r/default_row_format_02.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_000010.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_alter_repository.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_apply_binlog_with_gtid_when_gtid_mode_off.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions_clone.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_assign_gtids_to_anonymous_transactions_concurrent_channels.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_async_conn_failover_gtid_auto_position_error.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_auto_increment_bug33029.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_begin_commit_rollback.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_binlog_corruption.result
@@ -15064,6 +16394,8 @@ share/mysql/test/suite/rpl_nogtid/r/rpl_no_gtid_delete_memory_table_after_start_
 share/mysql/test/suite/rpl_nogtid/r/rpl_no_gtid_split_statements.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_no_gtid_split_statements_debug.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_atomic_cross_repl.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_compression_slave_skip_counter.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_create_select.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_encryption_read.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_mix_row_default_as_expr.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_nogtid_rollback_on_anonymous_gtid.result
@@ -15118,6 +16450,8 @@ share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_group_commit_deadlock.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_group_commit_deadlock_ssl.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_install_at_start_server.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_non_group_commit_deadlock.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_optimize_for_static_plugin_config.result
+share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_sender_observe_commit_only.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_shutdown_hang.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_uninstall_plugin.result
 share/mysql/test/suite/rpl_nogtid/r/rpl_semi_sync_wait_slave_count.result
@@ -15169,6 +16503,14 @@ share/mysql/test/suite/rpl_nogtid/t/rpl_000010.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_alter_repository-slave.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_alter_repository.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_apply_binlog_with_gtid_when_gtid_mode_off.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_clone-master.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_clone-slave.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_clone.cnf
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_clone.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_concurrent_channels.cnf
+share/mysql/test/suite/rpl_nogtid/t/rpl_assign_gtids_to_anonymous_transactions_concurrent_channels.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_async_conn_failover_gtid_auto_position_error.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_auto_increment_bug33029.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_begin_commit_rollback-master.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_begin_commit_rollback-slave.opt
@@ -15299,6 +16641,8 @@ share/mysql/test/suite/rpl_nogtid/t/rpl_no_gtid_delete_memory_table_after_start_
 share/mysql/test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_no_gtid_split_statements_debug.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_atomic_cross_repl.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_compression_slave_skip_counter.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_create_select.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_encryption_read.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_mix_row_default_as_expr.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_nogtid_rollback_on_anonymous_gtid.test
@@ -15406,6 +16750,12 @@ share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_install_at_start_server.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_non_group_commit_deadlock-master.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_non_group_commit_deadlock-slave.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_non_group_commit_deadlock.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_optimize_for_static_plugin_config-master.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_optimize_for_static_plugin_config-slave.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_optimize_for_static_plugin_config.test
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_sender_observe_commit_only-master.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_sender_observe_commit_only-slave.opt
+share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_sender_observe_commit_only.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_shutdown_hang-master.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_shutdown_hang-slave.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_semi_sync_shutdown_hang.test
@@ -15421,7 +16771,6 @@ share/mysql/test/suite/rpl_nogtid/t/rpl_server_uuid.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_set_gtid_mode_on_after_implicit_pre_commit.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_set_gtid_mode_ongoing_wait_function.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_skip_locked.test
-share/mysql/test/suite/rpl_nogtid/t/rpl_slave_require_row_format_basics_sql-slave.opt
 share/mysql/test/suite/rpl_nogtid/t/rpl_slave_require_row_format_basics_sql.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_slave_server_id_equal_to_zero.test
 share/mysql/test/suite/rpl_nogtid/t/rpl_slave_skip.test
@@ -15488,24 +16837,32 @@ share/mysql/test/suite/rpl_nogtid/t/transactional_ddl_locking-master.opt
 share/mysql/test/suite/rpl_nogtid/t/transactional_ddl_locking.test
 share/mysql/test/suite/secondary_engine/r/cost_threshold.result
 share/mysql/test/suite/secondary_engine/r/define.result
+share/mysql/test/suite/secondary_engine/r/explain.result
 share/mysql/test/suite/secondary_engine/r/histogram.result
 share/mysql/test/suite/secondary_engine/r/index_statistics.result
 share/mysql/test/suite/secondary_engine/r/install.result
 share/mysql/test/suite/secondary_engine/r/load.result
+share/mysql/test/suite/secondary_engine/r/optimizer_trace.result
+share/mysql/test/suite/secondary_engine/r/plan_cost_debug.result
 share/mysql/test/suite/secondary_engine/r/query_preparation.result
 share/mysql/test/suite/secondary_engine/r/query_preparation_debug.result
 share/mysql/test/suite/secondary_engine/r/system_variables.result
+share/mysql/test/suite/secondary_engine/r/transforms.result
 share/mysql/test/suite/secondary_engine/r/uninstall.result
 share/mysql/test/suite/secondary_engine/t/cost_threshold.test
 share/mysql/test/suite/secondary_engine/t/define.test
+share/mysql/test/suite/secondary_engine/t/explain.test
 share/mysql/test/suite/secondary_engine/t/histogram.test
 share/mysql/test/suite/secondary_engine/t/index_statistics.test
 share/mysql/test/suite/secondary_engine/t/install.test
 share/mysql/test/suite/secondary_engine/t/load.test
+share/mysql/test/suite/secondary_engine/t/optimizer_trace.test
+share/mysql/test/suite/secondary_engine/t/plan_cost_debug.test
 share/mysql/test/suite/secondary_engine/t/query_preparation.test
 share/mysql/test/suite/secondary_engine/t/query_preparation_debug.test
 share/mysql/test/suite/secondary_engine/t/suite.opt
 share/mysql/test/suite/secondary_engine/t/system_variables.test
+share/mysql/test/suite/secondary_engine/t/transforms.test
 share/mysql/test/suite/secondary_engine/t/uninstall.test
 share/mysql/test/suite/service_status_var_registration/include/have_component_test_status_var_service.inc
 share/mysql/test/suite/service_status_var_registration/r/status_var_service.result
@@ -15640,6 +16997,15 @@ share/mysql/test/suite/sys_vars/inc/slave_transaction_retries_basic.inc
 share/mysql/test/suite/sys_vars/inc/sort_buffer_size_basic.inc
 share/mysql/test/suite/sys_vars/r/admin_address_basic.result
 share/mysql/test/suite/sys_vars/r/admin_port_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_ca_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_capath_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_cert_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_cipher_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_crl_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_crlpath_basic.result
+share/mysql/test/suite/sys_vars/r/admin_ssl_key_basic.result
+share/mysql/test/suite/sys_vars/r/admin_tls_ciphersuites_basic.result
+share/mysql/test/suite/sys_vars/r/admin_tls_version_basic.result
 share/mysql/test/suite/sys_vars/r/all_vars.result
 share/mysql/test/suite/sys_vars/r/auto_generate_certs_basic.result
 share/mysql/test/suite/sys_vars/r/auto_increment_increment_basic.result
@@ -15680,12 +17046,15 @@ share/mysql/test/suite/sys_vars/r/binlog_row_value_options_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_rows_query_log_events_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/binlog_stmt_cache_size_basic_64.result
+share/mysql/test/suite/sys_vars/r/binlog_transaction_compression_basic.result
+share/mysql/test/suite/sys_vars/r/binlog_transaction_compression_level_zstd_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_transaction_dependency_h_size_basic.result
 share/mysql/test/suite/sys_vars/r/binlog_transaction_dependency_tracking_basic.result
 share/mysql/test/suite/sys_vars/r/block_encryption_mode_basic.result
 share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_32.result
 share/mysql/test/suite/sys_vars/r/bulk_insert_buffer_size_basic_64.result
 share/mysql/test/suite/sys_vars/r/caching_sha2_password_auto_generate_rsa_keys_basic.result
+share/mysql/test/suite/sys_vars/r/caching_sha2_password_digest_rounds_basic.result
 share/mysql/test/suite/sys_vars/r/caching_sha2_password_private_key_path_basic.result
 share/mysql/test/suite/sys_vars/r/caching_sha2_password_public_key_path_basic.result
 share/mysql/test/suite/sys_vars/r/character_set_client_basic.result
@@ -15843,6 +17212,10 @@ share/mysql/test/suite/sys_vars/r/innodb_disable_background_merge_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_doublewrite_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_doublewrite_batch_size_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_doublewrite_dir_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_doublewrite_files_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_doublewrite_pages_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_extend_and_initialize_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_fast_shutdown_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_fil_make_page_dirty_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_file_io_threads_basic.result
@@ -15873,6 +17246,8 @@ share/mysql/test/suite/sys_vars/r/innodb_ft_sort_pll_degree_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_total_cache_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_ft_user_stopword_table_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_idle_flush_pct_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_interpreter_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_interpreter_output_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_io_capacity_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_io_capacity_max_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_limit_optimistic_insert_debug_basic.result
@@ -15884,11 +17259,13 @@ share/mysql/test/suite/sys_vars/r/innodb_log_checksums_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_compressed_pages_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_file_size_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_files_in_group_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_log_flush_now_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_group_home_dir_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_log_spin_cpu_abs_lwm.result
 share/mysql/test/suite/sys_vars/r/innodb_log_spin_cpu_pct_hwm.result
 share/mysql/test/suite/sys_vars/r/innodb_log_wait_for_flush_spin_hwm.result
 share/mysql/test/suite/sys_vars/r/innodb_log_write_ahead_size_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_log_writer_threads_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_lru_scan_depth_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_master_thread_disabled_debug_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_max_dirty_pages_pct_basic.result
@@ -15961,6 +17338,7 @@ share/mysql/test/suite/sys_vars/r/innodb_undo_log_encrypt_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_use_native_aio_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_validate_tablespace_paths_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_version_basic.result
 share/mysql/test/suite/sys_vars/r/innodb_write_io_threads_basic.result
 share/mysql/test/suite/sys_vars/r/insert_id_basic.result
@@ -16051,7 +17429,6 @@ share/mysql/test/suite/sys_vars/r/max_heap_table_size_basic.result
 share/mysql/test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
 share/mysql/test/suite/sys_vars/r/max_join_size_basic.result
 share/mysql/test/suite/sys_vars/r/max_join_size_func.result
-share/mysql/test/suite/sys_vars/r/max_length_for_sort_data_basic.result
 share/mysql/test/suite/sys_vars/r/max_points_in_geometry_basic.result
 share/mysql/test/suite/sys_vars/r/max_prepared_stmt_count_basic.result
 share/mysql/test/suite/sys_vars/r/max_prepared_stmt_count_func.result
@@ -16090,10 +17467,14 @@ share/mysql/test/suite/sys_vars/r/mysql_native_password_proxy_users_log.result
 share/mysql/test/suite/sys_vars/r/mysqlx_bind_address_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_compression_algorithms_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_connect_timeout_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_deflate_default_compression_level_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_deflate_max_client_compression_level_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_document_id_unique_prefix_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_enable_hello_notice_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_idle_worker_thread_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_interactive_timeout_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_lz4_default_compression_level_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_lz4_max_client_compression_level_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_max_allowed_packet_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_max_connections_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_min_worker_threads_basic.result
@@ -16110,6 +17491,8 @@ share/mysql/test/suite/sys_vars/r/mysqlx_ssl_crlpath_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_ssl_key_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_wait_timeout_basic.result
 share/mysql/test/suite/sys_vars/r/mysqlx_write_timeout_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_zstd_default_compression_level_basic.result
+share/mysql/test/suite/sys_vars/r/mysqlx_zstd_max_client_compression_level_basic.result
 share/mysql/test/suite/sys_vars/r/named_pipe_basic.result
 share/mysql/test/suite/sys_vars/r/named_pipe_full_access_group_basic.result
 share/mysql/test/suite/sys_vars/r/net_buffer_length_basic.result
@@ -16187,6 +17570,7 @@ share/mysql/test/suite/sys_vars/r/pfs_max_thread_instances_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_session_connect_attrs_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_setup_actors_size_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_setup_objects_size_basic.result
+share/mysql/test/suite/sys_vars/r/pfs_show_processlist_basic.result
 share/mysql/test/suite/sys_vars/r/pfs_users_size_basic.result
 share/mysql/test/suite/sys_vars/r/pid_file_basic.result
 share/mysql/test/suite/sys_vars/r/plugin_dir_basic.result
@@ -16220,6 +17604,8 @@ share/mysql/test/suite/sys_vars/r/relay_log_info_repository_basic.result
 share/mysql/test/suite/sys_vars/r/relay_log_purge_basic.result
 share/mysql/test/suite/sys_vars/r/relay_log_recovery_basic.result
 share/mysql/test/suite/sys_vars/r/relay_log_space_limit_basic.result
+share/mysql/test/suite/sys_vars/r/replication_optimize_for_static_plugin_config.result
+share/mysql/test/suite/sys_vars/r/replication_sender_observe_commit_only.result
 share/mysql/test/suite/sys_vars/r/report_host_basic.result
 share/mysql/test/suite/sys_vars/r/report_password_basic.result
 share/mysql/test/suite/sys_vars/r/report_port_basic.result
@@ -16245,6 +17631,9 @@ share/mysql/test/suite/sys_vars/r/secondary_engine_cost_threshold_basic.result
 share/mysql/test/suite/sys_vars/r/secure_file_priv.result
 share/mysql/test/suite/sys_vars/r/secure_file_priv2.result
 share/mysql/test/suite/sys_vars/r/secure_file_priv_basic.result
+share/mysql/test/suite/sys_vars/r/select_into_buffer_size.result
+share/mysql/test/suite/sys_vars/r/select_into_disk_sync.result
+share/mysql/test/suite/sys_vars/r/select_into_disk_sync_delay.result
 share/mysql/test/suite/sys_vars/r/server_id_basic.result
 share/mysql/test/suite/sys_vars/r/server_id_bits_basic.result
 share/mysql/test/suite/sys_vars/r/server_uuid_basic.result
@@ -16269,6 +17658,7 @@ share/mysql/test/suite/sys_vars/r/skip_external_locking_basic.result
 share/mysql/test/suite/sys_vars/r/skip_name_resolve_basic.result
 share/mysql/test/suite/sys_vars/r/skip_networking_basic.result
 share/mysql/test/suite/sys_vars/r/skip_show_database_basic.result
+share/mysql/test/suite/sys_vars/r/skip_slave_start.result
 share/mysql/test/suite/sys_vars/r/slave_allow_batching_basic.result
 share/mysql/test/suite/sys_vars/r/slave_checkpoint_group_basic.result
 share/mysql/test/suite/sys_vars/r/slave_checkpoint_period_basic.result
@@ -16375,6 +17765,15 @@ share/mysql/test/suite/sys_vars/r/warning_count_basic.result
 share/mysql/test/suite/sys_vars/r/windowing_use_high_precision_basic.result
 share/mysql/test/suite/sys_vars/t/admin_address_basic.test
 share/mysql/test/suite/sys_vars/t/admin_port_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_ca_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_capath_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_cert_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_cipher_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_crl_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_crlpath_basic.test
+share/mysql/test/suite/sys_vars/t/admin_ssl_key_basic.test
+share/mysql/test/suite/sys_vars/t/admin_tls_ciphersuites_basic.test
+share/mysql/test/suite/sys_vars/t/admin_tls_version_basic.test
 share/mysql/test/suite/sys_vars/t/all_vars-master.opt
 share/mysql/test/suite/sys_vars/t/all_vars.test
 share/mysql/test/suite/sys_vars/t/auto_generate_certs_basic.test
@@ -16421,12 +17820,15 @@ share/mysql/test/suite/sys_vars/t/binlog_row_value_options_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_rows_query_log_events_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/binlog_stmt_cache_size_basic_64.test
+share/mysql/test/suite/sys_vars/t/binlog_transaction_compression_basic.test
+share/mysql/test/suite/sys_vars/t/binlog_transaction_compression_level_zstd_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_transaction_dependency_h_size_basic.test
 share/mysql/test/suite/sys_vars/t/binlog_transaction_dependency_tracking_basic.test
 share/mysql/test/suite/sys_vars/t/block_encryption_mode_basic.test
 share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_32.test
 share/mysql/test/suite/sys_vars/t/bulk_insert_buffer_size_basic_64.test
 share/mysql/test/suite/sys_vars/t/caching_sha2_password_auto_generate_rsa_keys_basic.test
+share/mysql/test/suite/sys_vars/t/caching_sha2_password_digest_rounds_basic.test
 share/mysql/test/suite/sys_vars/t/caching_sha2_password_private_key_path_basic.test
 share/mysql/test/suite/sys_vars/t/caching_sha2_password_public_key_path_basic.test
 share/mysql/test/suite/sys_vars/t/character_set_client_basic.test
@@ -16597,6 +17999,10 @@ share/mysql/test/suite/sys_vars/t/innodb_disable_background_merge_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_doublewrite_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_doublewrite_batch_size_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_doublewrite_dir_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_doublewrite_files_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_doublewrite_pages_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_extend_and_initialize_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_fast_shutdown_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_fil_make_page_dirty_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_file_io_threads_basic.test
@@ -16628,6 +18034,8 @@ share/mysql/test/suite/sys_vars/t/innodb_ft_sort_pll_degree_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_total_cache_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_ft_user_stopword_table_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_idle_flush_pct_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_interpreter_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_interpreter_output_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_io_capacity_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_io_capacity_max_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_limit_optimistic_insert_debug_basic.test
@@ -16639,11 +18047,13 @@ share/mysql/test/suite/sys_vars/t/innodb_log_checksums_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_compressed_pages_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_file_size_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_files_in_group_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_log_flush_now_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_group_home_dir_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_log_spin_cpu_abs_lwm.test
 share/mysql/test/suite/sys_vars/t/innodb_log_spin_cpu_pct_hwm.test
 share/mysql/test/suite/sys_vars/t/innodb_log_wait_for_flush_spin_hwm.test
 share/mysql/test/suite/sys_vars/t/innodb_log_write_ahead_size_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_log_writer_threads_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_lru_scan_depth_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_master_thread_disabled_debug_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_max_dirty_pages_pct_basic.test
@@ -16719,6 +18129,7 @@ share/mysql/test/suite/sys_vars/t/innodb_undo_log_encrypt_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_undo_log_truncate_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_use_native_aio_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_validate_tablespace_paths_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_version_basic.test
 share/mysql/test/suite/sys_vars/t/innodb_write_io_threads_basic.test
 share/mysql/test/suite/sys_vars/t/insert_id_basic.test
@@ -16828,7 +18239,6 @@ share/mysql/test/suite/sys_vars/t/max_heap_table_size_basic.test
 share/mysql/test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
 share/mysql/test/suite/sys_vars/t/max_join_size_basic.test
 share/mysql/test/suite/sys_vars/t/max_join_size_func.test
-share/mysql/test/suite/sys_vars/t/max_length_for_sort_data_basic.test
 share/mysql/test/suite/sys_vars/t/max_points_in_geometry_basic.test
 share/mysql/test/suite/sys_vars/t/max_prepared_stmt_count_basic.test
 share/mysql/test/suite/sys_vars/t/max_prepared_stmt_count_func.test
@@ -16871,10 +18281,14 @@ share/mysql/test/suite/sys_vars/t/mysql_native_password_proxy_users_log.test
 share/mysql/test/suite/sys_vars/t/mysqlx_bind_address_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_compression_algorithms_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_connect_timeout_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_deflate_default_compression_level_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_deflate_max_client_compression_level_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_document_id_unique_prefix_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_enable_hello_notice_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_idle_worker_thread_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_interactive_timeout_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_lz4_default_compression_level_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_lz4_max_client_compression_level_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_max_allowed_packet_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_max_connections_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_min_worker_threads_basic.test
@@ -16891,6 +18305,8 @@ share/mysql/test/suite/sys_vars/t/mysqlx_ssl_crlpath_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_ssl_key_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_wait_timeout_basic.test
 share/mysql/test/suite/sys_vars/t/mysqlx_write_timeout_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_zstd_default_compression_level_basic.test
+share/mysql/test/suite/sys_vars/t/mysqlx_zstd_max_client_compression_level_basic.test
 share/mysql/test/suite/sys_vars/t/named_pipe_basic.test
 share/mysql/test/suite/sys_vars/t/named_pipe_full_access_group_basic-master.opt
 share/mysql/test/suite/sys_vars/t/named_pipe_full_access_group_basic.test
@@ -17019,6 +18435,8 @@ share/mysql/test/suite/sys_vars/t/pfs_setup_actors_size_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_setup_actors_size_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_setup_objects_size_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_setup_objects_size_basic.test
+share/mysql/test/suite/sys_vars/t/pfs_show_processlist_basic-master.opt
+share/mysql/test/suite/sys_vars/t/pfs_show_processlist_basic.test
 share/mysql/test/suite/sys_vars/t/pfs_users_size_basic-master.opt
 share/mysql/test/suite/sys_vars/t/pfs_users_size_basic.test
 share/mysql/test/suite/sys_vars/t/pid_file_basic.test
@@ -17056,6 +18474,9 @@ share/mysql/test/suite/sys_vars/t/relay_log_info_repository_basic.test
 share/mysql/test/suite/sys_vars/t/relay_log_purge_basic.test
 share/mysql/test/suite/sys_vars/t/relay_log_recovery_basic.test
 share/mysql/test/suite/sys_vars/t/relay_log_space_limit_basic.test
+share/mysql/test/suite/sys_vars/t/replication_optimize_for_static_plugin_config-master.opt
+share/mysql/test/suite/sys_vars/t/replication_optimize_for_static_plugin_config.test
+share/mysql/test/suite/sys_vars/t/replication_sender_observe_commit_only.test
 share/mysql/test/suite/sys_vars/t/report_host_basic.test
 share/mysql/test/suite/sys_vars/t/report_password_basic.test
 share/mysql/test/suite/sys_vars/t/report_port_basic.test
@@ -17093,6 +18514,9 @@ share/mysql/test/suite/sys_vars/t/secure_file_priv.test
 share/mysql/test/suite/sys_vars/t/secure_file_priv2-master.opt
 share/mysql/test/suite/sys_vars/t/secure_file_priv2.test
 share/mysql/test/suite/sys_vars/t/secure_file_priv_basic.test
+share/mysql/test/suite/sys_vars/t/select_into_buffer_size.test
+share/mysql/test/suite/sys_vars/t/select_into_disk_sync.test
+share/mysql/test/suite/sys_vars/t/select_into_disk_sync_delay.test
 share/mysql/test/suite/sys_vars/t/server_id_basic.test
 share/mysql/test/suite/sys_vars/t/server_id_bits_basic.test
 share/mysql/test/suite/sys_vars/t/server_uuid_basic.test
@@ -17121,6 +18545,7 @@ share/mysql/test/suite/sys_vars/t/skip_name_resolve_basic-master.opt
 share/mysql/test/suite/sys_vars/t/skip_name_resolve_basic.test
 share/mysql/test/suite/sys_vars/t/skip_networking_basic.test
 share/mysql/test/suite/sys_vars/t/skip_show_database_basic.test
+share/mysql/test/suite/sys_vars/t/skip_slave_start.test
 share/mysql/test/suite/sys_vars/t/slave_allow_batching_basic.test
 share/mysql/test/suite/sys_vars/t/slave_checkpoint_group_basic.test
 share/mysql/test/suite/sys_vars/t/slave_checkpoint_period_basic.test
@@ -17441,6 +18866,7 @@ share/mysql/test/suite/test_service_sql_api/r/test_sql_processlist.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_replication.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_reset_connection.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_shutdown.result
+share/mysql/test/suite/test_service_sql_api/r/test_sql_sleep_is_connected.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_sqlmode.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_stmt.result
 share/mysql/test/suite/test_service_sql_api/r/test_sql_stored_procedures_functions.result
@@ -17483,6 +18909,8 @@ share/mysql/test/suite/test_service_sql_api/t/test_sql_reset_connection-master.o
 share/mysql/test/suite/test_service_sql_api/t/test_sql_reset_connection.test
 share/mysql/test/suite/test_service_sql_api/t/test_sql_shutdown-master.opt
 share/mysql/test/suite/test_service_sql_api/t/test_sql_shutdown.test
+share/mysql/test/suite/test_service_sql_api/t/test_sql_sleep_is_connected-master.opt
+share/mysql/test/suite/test_service_sql_api/t/test_sql_sleep_is_connected.test
 share/mysql/test/suite/test_service_sql_api/t/test_sql_sqlmode-master.opt
 share/mysql/test/suite/test_service_sql_api/t/test_sql_sqlmode.test
 share/mysql/test/suite/test_service_sql_api/t/test_sql_stmt-master.opt
@@ -17527,6 +18955,9 @@ share/mysql/test/suite/test_services/t/test_udf_extension_services_plugin.test
 share/mysql/test/suite/test_services/t/test_udf_registration-master.opt
 share/mysql/test/suite/test_services/t/test_udf_registration.test
 share/mysql/test/suite/x/include/admin_list_objects_table_names.inc
+share/mysql/test/suite/x/include/compression_level_adjustment_common.inc
+share/mysql/test/suite/x/include/compression_level_client_common.inc
+share/mysql/test/suite/x/include/compression_level_server_common.inc
 share/mysql/test/suite/x/include/connection_auth_same_user_name.inc
 share/mysql/test/suite/x/include/connection_default_schema.inc
 share/mysql/test/suite/x/include/connection_local_scope.inc
@@ -17540,12 +18971,16 @@ share/mysql/test/suite/x/include/crud_limit.inc
 share/mysql/test/suite/x/include/have_performance_schema_events_waits_history.inc
 share/mysql/test/suite/x/include/have_performance_schema_statements.inc
 share/mysql/test/suite/x/include/have_performance_schema_threads.inc
+share/mysql/test/suite/x/include/have_zstd_proper_ver.inc
 share/mysql/test/suite/x/include/mysqlxtest_mode_ssl.inc
+share/mysql/test/suite/x/include/not_have_zstd_proper_ver.inc
 share/mysql/test/suite/x/include/performance_schema_assert_empty_worker_threads.inc
 share/mysql/test/suite/x/include/remove_mysql_accounts_for_xplugin_tests.inc
+share/mysql/test/suite/x/include/restart_mysqld_and_verify_bind_addresses.inc
 share/mysql/test/suite/x/include/restart_mysqld_and_wait_for_xplugin.inc
 share/mysql/test/suite/x/include/restart_mysqld_pipe.inc
 share/mysql/test/suite/x/include/sample_tables.inc
+share/mysql/test/suite/x/include/show_xpl_debug_info.inc
 share/mysql/test/suite/x/include/stored_procedures.inc
 share/mysql/test/suite/x/include/system_variable_timeout.inc
 share/mysql/test/suite/x/include/test_flow_resultset_crud_document.inc
@@ -17559,11 +18994,13 @@ share/mysql/test/suite/x/include/test_flow_resultset_stmtexecute_sql.inc
 share/mysql/test/suite/x/include/test_session_reset.inc
 share/mysql/test/suite/x/include/wait_for_status_variables.inc
 share/mysql/test/suite/x/include/wait_until_connected_again_pipe.inc
+share/mysql/test/suite/x/include/xplugin_cleanup.inc
 share/mysql/test/suite/x/include/xplugin_pfs_instruments_enable.inc
 share/mysql/test/suite/x/include/xplugin_pfs_instruments_query.inc
-share/mysql/test/suite/x/plugin.defs
+share/mysql/test/suite/x/include/xplugin_wait_for_connection_closure.inc
 share/mysql/test/suite/x/r/admin_bogus.result
 share/mysql/test/suite/x/r/admin_cmd_error_msg.result
+share/mysql/test/suite/x/r/admin_collection_metaschema_official_examples.result
 share/mysql/test/suite/x/r/admin_collection_metaschema_validation.result
 share/mysql/test/suite/x/r/admin_create_collection.result
 share/mysql/test/suite/x/r/admin_create_collection_default_validation.result
@@ -17592,12 +19029,26 @@ share/mysql/test/suite/x/r/blob_partial_update.result
 share/mysql/test/suite/x/r/bug_23028052.result
 share/mysql/test/suite/x/r/capabilities.result
 share/mysql/test/suite/x/r/capabilities_compression.result
+share/mysql/test/suite/x/r/charset_default.result
+share/mysql/test/suite/x/r/client_accepting.result
 share/mysql/test/suite/x/r/client_close.result
 share/mysql/test/suite/x/r/client_close_abort.result
 share/mysql/test/suite/x/r/client_session.result
 share/mysql/test/suite/x/r/collection_compatibility.result
 share/mysql/test/suite/x/r/compression_client.result
 share/mysql/test/suite/x/r/compression_client_mixed_caps.result
+share/mysql/test/suite/x/r/compression_level_deflate_adjustment.result
+share/mysql/test/suite/x/r/compression_level_deflate_client.result
+share/mysql/test/suite/x/r/compression_level_deflate_server.result
+share/mysql/test/suite/x/r/compression_level_lz4_adjustment.result
+share/mysql/test/suite/x/r/compression_level_lz4_client.result
+share/mysql/test/suite/x/r/compression_level_lz4_server.result
+share/mysql/test/suite/x/r/compression_level_obsolete_zstd_adjustment.result
+share/mysql/test/suite/x/r/compression_level_obsolete_zstd_client.result
+share/mysql/test/suite/x/r/compression_level_obsolete_zstd_server.result
+share/mysql/test/suite/x/r/compression_level_zstd_adjustment.result
+share/mysql/test/suite/x/r/compression_level_zstd_client.result
+share/mysql/test/suite/x/r/compression_level_zstd_server.result
 share/mysql/test/suite/x/r/compression_limit_message_count.result
 share/mysql/test/suite/x/r/compression_multiple_changes.result
 share/mysql/test/suite/x/r/compression_server.result
@@ -17615,6 +19066,7 @@ share/mysql/test/suite/x/r/connection_auth_same_user_name_win.result
 share/mysql/test/suite/x/r/connection_auth_sequence.result
 share/mysql/test/suite/x/r/connection_auth_sequence_fatal_error.result
 share/mysql/test/suite/x/r/connection_auth_sequence_timeout.result
+share/mysql/test/suite/x/r/connection_autocommit_off.result
 share/mysql/test/suite/x/r/connection_default_schema.result
 share/mysql/test/suite/x/r/connection_expire.result
 share/mysql/test/suite/x/r/connection_expired_certs.result
@@ -17622,7 +19074,12 @@ share/mysql/test/suite/x/r/connection_fips.result
 share/mysql/test/suite/x/r/connection_invalid.result
 share/mysql/test/suite/x/r/connection_ipv6.result
 share/mysql/test/suite/x/r/connection_local_scope.result
+share/mysql/test/suite/x/r/connection_multi_bind_address.result
+share/mysql/test/suite/x/r/connection_multi_bind_address_ipv6.result
+share/mysql/test/suite/x/r/connection_multi_bind_address_ipv6_win.result
+share/mysql/test/suite/x/r/connection_multi_bind_address_win.result
 share/mysql/test/suite/x/r/connection_nonssl.result
+share/mysql/test/suite/x/r/connection_not_alive.result
 share/mysql/test/suite/x/r/connection_openssl.result
 share/mysql/test/suite/x/r/connection_openssl_unixsocket.result
 share/mysql/test/suite/x/r/connection_require_secure_transport.result
@@ -17631,6 +19088,7 @@ share/mysql/test/suite/x/r/connection_skip_grant_table.result
 share/mysql/test/suite/x/r/connection_skip_grant_table_ssl.result
 share/mysql/test/suite/x/r/connection_skip_networking.result
 share/mysql/test/suite/x/r/connection_skip_networking_win.result
+share/mysql/test/suite/x/r/connection_sql_mode.result
 share/mysql/test/suite/x/r/connection_timeout.result
 share/mysql/test/suite/x/r/connection_timeout_local.result
 share/mysql/test/suite/x/r/connection_tls_version.result
@@ -17745,6 +19203,7 @@ share/mysql/test/suite/x/r/flow_resultset_stmtexecute_sql.result
 share/mysql/test/suite/x/r/forbidden_sql_cmd.result
 share/mysql/test/suite/x/r/gis_spatial_functions.result
 share/mysql/test/suite/x/r/global_status_reset.result
+share/mysql/test/suite/x/r/initialization.result
 share/mysql/test/suite/x/r/input_queue.result
 share/mysql/test/suite/x/r/insert_crud_1.result
 share/mysql/test/suite/x/r/insert_crud_o.result
@@ -17762,6 +19221,8 @@ share/mysql/test/suite/x/r/insert_table_missing_notnull_column.result
 share/mysql/test/suite/x/r/insert_table_string_quoting.result
 share/mysql/test/suite/x/r/interactive_timeout.result
 share/mysql/test/suite/x/r/killconnection.result
+share/mysql/test/suite/x/r/killconnection_sakiladb.result
+share/mysql/test/suite/x/r/killquery.result
 share/mysql/test/suite/x/r/log_encrypt_xplugin.result
 share/mysql/test/suite/x/r/message_compressed_empty.result
 share/mysql/test/suite/x/r/message_compressed_payload.result
@@ -17782,6 +19243,10 @@ share/mysql/test/suite/x/r/mysqlxtest_mode_compression.result
 share/mysql/test/suite/x/r/mysqlxtest_mode_ssl.result
 share/mysql/test/suite/x/r/mysqlxtest_mode_ssl_unixsocket.result
 share/mysql/test/suite/x/r/mysqlxtest_variables.result
+share/mysql/test/suite/x/r/notice_admin_kill.result
+share/mysql/test/suite/x/r/notice_kill.result
+share/mysql/test/suite/x/r/notice_shutdown.result
+share/mysql/test/suite/x/r/notice_timeout.result
 share/mysql/test/suite/x/r/notice_warning.result
 share/mysql/test/suite/x/r/notices_disable.result
 share/mysql/test/suite/x/r/notices_enable.result
@@ -17805,16 +19270,22 @@ share/mysql/test/suite/x/r/prep_stmt_sql.result
 share/mysql/test/suite/x/r/prep_stmt_sundries.result
 share/mysql/test/suite/x/r/read_timeout.result
 share/mysql/test/suite/x/r/regression.result
+share/mysql/test/suite/x/r/resource_groups.result
 share/mysql/test/suite/x/r/result_types.result
 share/mysql/test/suite/x/r/roles_xplugin.result
+share/mysql/test/suite/x/r/session_close.result
 share/mysql/test/suite/x/r/session_connect_attributes.result
 share/mysql/test/suite/x/r/session_connect_attributes_with_session_reset.result
 share/mysql/test/suite/x/r/session_connect_timeout.result
 share/mysql/test/suite/x/r/session_reset.result
 share/mysql/test/suite/x/r/session_reset_keep_open.result
+share/mysql/test/suite/x/r/session_resource_group.result
+share/mysql/test/suite/x/r/session_sleep.result
+share/mysql/test/suite/x/r/shutdown_before_initialization.result
 share/mysql/test/suite/x/r/ssl_verify_identity.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_mutexes.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_compression_client.result
@@ -17824,6 +19295,7 @@ share/mysql/test/suite/x/r/stmtexecute_query_no_result.result
 share/mysql/test/suite/x/r/stmtexecute_query_result.result
 share/mysql/test/suite/x/r/stmtexecute_status_vars.result
 share/mysql/test/suite/x/r/stmtexecute_with_args.result
+share/mysql/test/suite/x/r/switch_to_user.result
 share/mysql/test/suite/x/r/system_user_kill.result
 share/mysql/test/suite/x/r/system_variable_bind_address.result
 share/mysql/test/suite/x/r/system_variable_compression_algorithms.result
@@ -17850,6 +19322,7 @@ share/mysql/test/suite/x/r/wait_timeout.result
 share/mysql/test/suite/x/r/x_random_password.result
 share/mysql/test/suite/x/t/admin_bogus.test
 share/mysql/test/suite/x/t/admin_cmd_error_msg.test
+share/mysql/test/suite/x/t/admin_collection_metaschema_official_examples.test
 share/mysql/test/suite/x/t/admin_collection_metaschema_validation.test
 share/mysql/test/suite/x/t/admin_create_collection.test
 share/mysql/test/suite/x/t/admin_create_collection_default_validation.test
@@ -17882,12 +19355,26 @@ share/mysql/test/suite/x/t/bug_23028052.test
 share/mysql/test/suite/x/t/capabilities-master.opt
 share/mysql/test/suite/x/t/capabilities.test
 share/mysql/test/suite/x/t/capabilities_compression.test
+share/mysql/test/suite/x/t/charset_default.test
+share/mysql/test/suite/x/t/client_accepting.test
 share/mysql/test/suite/x/t/client_close.test
 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/collection_compatibility.test
 share/mysql/test/suite/x/t/compression_client.test
 share/mysql/test/suite/x/t/compression_client_mixed_caps.test
+share/mysql/test/suite/x/t/compression_level_deflate_adjustment.test
+share/mysql/test/suite/x/t/compression_level_deflate_client.test
+share/mysql/test/suite/x/t/compression_level_deflate_server.test
+share/mysql/test/suite/x/t/compression_level_lz4_adjustment.test
+share/mysql/test/suite/x/t/compression_level_lz4_client.test
+share/mysql/test/suite/x/t/compression_level_lz4_server.test
+share/mysql/test/suite/x/t/compression_level_obsolete_zstd_adjustment.test
+share/mysql/test/suite/x/t/compression_level_obsolete_zstd_client.test
+share/mysql/test/suite/x/t/compression_level_obsolete_zstd_server.test
+share/mysql/test/suite/x/t/compression_level_zstd_adjustment.test
+share/mysql/test/suite/x/t/compression_level_zstd_client.test
+share/mysql/test/suite/x/t/compression_level_zstd_server.test
 share/mysql/test/suite/x/t/compression_limit_message_count.test
 share/mysql/test/suite/x/t/compression_multiple_changes.test
 share/mysql/test/suite/x/t/compression_server.test
@@ -17909,6 +19396,7 @@ share/mysql/test/suite/x/t/connection_auth_same_user_name_win.test
 share/mysql/test/suite/x/t/connection_auth_sequence.test
 share/mysql/test/suite/x/t/connection_auth_sequence_fatal_error.test
 share/mysql/test/suite/x/t/connection_auth_sequence_timeout.test
+share/mysql/test/suite/x/t/connection_autocommit_off.test
 share/mysql/test/suite/x/t/connection_default_schema.test
 share/mysql/test/suite/x/t/connection_expire.test
 share/mysql/test/suite/x/t/connection_expired_certs-master.opt
@@ -17918,8 +19406,13 @@ share/mysql/test/suite/x/t/connection_invalid.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_local_scope.test
+share/mysql/test/suite/x/t/connection_multi_bind_address.test
+share/mysql/test/suite/x/t/connection_multi_bind_address_ipv6.test
+share/mysql/test/suite/x/t/connection_multi_bind_address_ipv6_win.test
+share/mysql/test/suite/x/t/connection_multi_bind_address_win.test
 share/mysql/test/suite/x/t/connection_nonssl-master.opt
 share/mysql/test/suite/x/t/connection_nonssl.test
+share/mysql/test/suite/x/t/connection_not_alive.test
 share/mysql/test/suite/x/t/connection_openssl-master.opt
 share/mysql/test/suite/x/t/connection_openssl.test
 share/mysql/test/suite/x/t/connection_openssl_unixsocket-master.opt
@@ -17932,6 +19425,7 @@ share/mysql/test/suite/x/t/connection_skip_grant_table_ssl-master.opt
 share/mysql/test/suite/x/t/connection_skip_grant_table_ssl.test
 share/mysql/test/suite/x/t/connection_skip_networking.test
 share/mysql/test/suite/x/t/connection_skip_networking_win.test
+share/mysql/test/suite/x/t/connection_sql_mode.test
 share/mysql/test/suite/x/t/connection_timeout.test
 share/mysql/test/suite/x/t/connection_timeout_local.test
 share/mysql/test/suite/x/t/connection_tls_version-master.opt
@@ -18048,6 +19542,7 @@ share/mysql/test/suite/x/t/flow_resultset_stmtexecute_sql.test
 share/mysql/test/suite/x/t/forbidden_sql_cmd.test
 share/mysql/test/suite/x/t/gis_spatial_functions.test
 share/mysql/test/suite/x/t/global_status_reset.test
+share/mysql/test/suite/x/t/initialization.test
 share/mysql/test/suite/x/t/input_queue.test
 share/mysql/test/suite/x/t/insert_crud_1.test
 share/mysql/test/suite/x/t/insert_crud_o.test
@@ -18065,10 +19560,13 @@ 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/interactive_timeout.test
 share/mysql/test/suite/x/t/killconnection.test
+share/mysql/test/suite/x/t/killconnection_sakiladb.test
+share/mysql/test/suite/x/t/killquery.test
 share/mysql/test/suite/x/t/log_encrypt_xplugin.test
 share/mysql/test/suite/x/t/macros/admin_stmt.macro
 share/mysql/test/suite/x/t/macros/assert_messages.macro
 share/mysql/test/suite/x/t/macros/assert_notices.macro
+share/mysql/test/suite/x/t/macros/assert_schema.macro
 share/mysql/test/suite/x/t/macros/assert_select.macro
 share/mysql/test/suite/x/t/macros/assert_status_variable.macro
 share/mysql/test/suite/x/t/macros/assert_variable.macro
@@ -18080,6 +19578,7 @@ share/mysql/test/suite/x/t/macros/crud_delete.macro
 share/mysql/test/suite/x/t/macros/crud_find.macro
 share/mysql/test/suite/x/t/macros/crud_insert.macro
 share/mysql/test/suite/x/t/macros/crud_update.macro
+share/mysql/test/suite/x/t/macros/debug_point.macro
 share/mysql/test/suite/x/t/macros/expect.macro
 share/mysql/test/suite/x/t/macros/group_replication.macro
 share/mysql/test/suite/x/t/macros/kill_and_restart.macro
@@ -18117,6 +19616,10 @@ share/mysql/test/suite/x/t/mysqlxtest_mode_ssl.test
 share/mysql/test/suite/x/t/mysqlxtest_mode_ssl_unixsocket-master.opt
 share/mysql/test/suite/x/t/mysqlxtest_mode_ssl_unixsocket.test
 share/mysql/test/suite/x/t/mysqlxtest_variables.test
+share/mysql/test/suite/x/t/notice_admin_kill.test
+share/mysql/test/suite/x/t/notice_kill.test
+share/mysql/test/suite/x/t/notice_shutdown.test
+share/mysql/test/suite/x/t/notice_timeout.test
 share/mysql/test/suite/x/t/notice_warning.test
 share/mysql/test/suite/x/t/notices_disable-master.opt
 share/mysql/test/suite/x/t/notices_disable.test
@@ -18156,17 +19659,23 @@ share/mysql/test/suite/x/t/prep_stmt_sundries.test
 share/mysql/test/suite/x/t/read_timeout.test
 share/mysql/test/suite/x/t/regression-master.opt
 share/mysql/test/suite/x/t/regression.test
+share/mysql/test/suite/x/t/resource_groups.test
 share/mysql/test/suite/x/t/result_types.test
 share/mysql/test/suite/x/t/roles_xplugin.test
+share/mysql/test/suite/x/t/session_close.test
 share/mysql/test/suite/x/t/session_connect_attributes.test
 share/mysql/test/suite/x/t/session_connect_attributes_with_session_reset.test
 share/mysql/test/suite/x/t/session_connect_timeout.test
 share/mysql/test/suite/x/t/session_reset.test
 share/mysql/test/suite/x/t/session_reset_keep_open.test
+share/mysql/test/suite/x/t/session_resource_group.test
+share/mysql/test/suite/x/t/session_sleep.test
+share/mysql/test/suite/x/t/shutdown_before_initialization.test
 share/mysql/test/suite/x/t/ssl_verify_identity-master.opt
 share/mysql/test/suite/x/t/ssl_verify_identity.test
 share/mysql/test/suite/x/t/status_bytes_received.test
 share/mysql/test/suite/x/t/status_variable_errors_unknown_message_type.test
+share/mysql/test/suite/x/t/status_variable_mutexes.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
@@ -18178,6 +19687,7 @@ share/mysql/test/suite/x/t/stmtexecute_query_result.test
 share/mysql/test/suite/x/t/stmtexecute_status_vars.test
 share/mysql/test/suite/x/t/stmtexecute_with_args.test
 share/mysql/test/suite/x/t/suite.opt
+share/mysql/test/suite/x/t/switch_to_user.test
 share/mysql/test/suite/x/t/system_user_kill.test
 share/mysql/test/suite/x/t/system_variable_bind_address.test
 share/mysql/test/suite/x/t/system_variable_compression_algorithms.test
@@ -18221,6 +19731,7 @@ share/mysql/test/t/alter_table_myisam.test
 share/mysql/test/t/alter_table_partition-master.opt
 share/mysql/test/t/alter_table_partition.test
 share/mysql/test/t/analyze.test
+share/mysql/test/t/analyze_debug.test
 share/mysql/test/t/analyze_myisam.test
 share/mysql/test/t/ansi.test
 share/mysql/test/t/archive-master.opt
@@ -18234,18 +19745,28 @@ share/mysql/test/t/archive_plugin.test
 share/mysql/test/t/archive_skip_lock_nowait.test
 share/mysql/test/t/archive_symlink-master.opt
 share/mysql/test/t/archive_symlink.test
+share/mysql/test/t/async_client.inc
 share/mysql/test/t/async_client.test
+share/mysql/test/t/async_compress_client.inc
+share/mysql/test/t/async_compress_client.test
 share/mysql/test/t/auth_rpl-master.opt
 share/mysql/test/t/auth_rpl-slave.opt
 share/mysql/test/t/auth_rpl.test
 share/mysql/test/t/auto_increment.test
 share/mysql/test/t/bad_alloc.test
+share/mysql/test/t/basedir-master.opt
 share/mysql/test/t/basedir.test
 share/mysql/test/t/bench_count_distinct.test
 share/mysql/test/t/big_packets-master.opt
+share/mysql/test/t/big_packets.inc
 share/mysql/test/t/big_packets.test
+share/mysql/test/t/big_packets_async-master.opt
+share/mysql/test/t/big_packets_async.test
 share/mysql/test/t/big_packets_boundary-master.opt
+share/mysql/test/t/big_packets_boundary.inc
 share/mysql/test/t/big_packets_boundary.test
+share/mysql/test/t/big_packets_boundary_async-master.opt
+share/mysql/test/t/big_packets_boundary_async.test
 share/mysql/test/t/bigint.test
 share/mysql/test/t/binary.test
 share/mysql/test/t/binary_to_hex.test
@@ -18343,6 +19864,8 @@ share/mysql/test/t/create.test
 share/mysql/test/t/create_myisam.test
 share/mysql/test/t/create_not_windows.test
 share/mysql/test/t/create_ps_protocol.test
+share/mysql/test/t/create_select_atomic.test
+share/mysql/test/t/create_select_foreign_key.test
 share/mysql/test/t/create_select_tmp.test
 share/mysql/test/t/create_select_tmp_myisam.test
 share/mysql/test/t/create_w_max_indexes_64.test
@@ -18429,8 +19952,6 @@ share/mysql/test/t/ctype_utf8mb4_innodb-master.opt
 share/mysql/test/t/ctype_utf8mb4_innodb.test
 share/mysql/test/t/ctype_utf8mb4_myisam.test
 share/mysql/test/t/ctype_utf8mb4_uca.test
-share/mysql/test/t/daemonize_opt-master.opt
-share/mysql/test/t/daemonize_opt.test
 share/mysql/test/t/datadir_permission.test
 share/mysql/test/t/date_formats.test
 share/mysql/test/t/dd_bootstrap.test
@@ -18449,6 +19970,7 @@ share/mysql/test/t/dd_is_debug_myisam.test
 share/mysql/test/t/dd_is_gcov.test
 share/mysql/test/t/dd_is_gcov_myisam.test
 share/mysql/test/t/dd_is_view_usage.test
+share/mysql/test/t/dd_pfs.test
 share/mysql/test/t/dd_schema_dd_properties_debug-master.opt
 share/mysql/test/t/dd_schema_dd_properties_debug.test
 share/mysql/test/t/dd_schema_definition_after_upgrade_57_debug-master.opt
@@ -18499,9 +20021,9 @@ share/mysql/test/t/deprecate_eof.test
 share/mysql/test/t/deprecated_features.test
 share/mysql/test/t/deprecation_56-master.opt
 share/mysql/test/t/deprecation_56.test
-share/mysql/test/t/derived-no-prepared.test
 share/mysql/test/t/derived.test
 share/mysql/test/t/derived_ci.test
+share/mysql/test/t/derived_condition_pushdown.test
 share/mysql/test/t/derived_correlated.test
 share/mysql/test/t/derived_cs.test
 share/mysql/test/t/derived_limit.test
@@ -18509,6 +20031,7 @@ share/mysql/test/t/desc_index_innodb.test
 share/mysql/test/t/dictionary_tablespace.test
 share/mysql/test/t/dictionary_timestamp.test
 share/mysql/test/t/dirty_close.test
+share/mysql/test/t/disable_drop_rename_user.test
 share/mysql/test/t/disabled_replication-master.opt
 share/mysql/test/t/disabled_replication.test
 share/mysql/test/t/disabled_storage_engines-master.opt
@@ -18526,6 +20049,8 @@ share/mysql/test/t/empty_table.test
 share/mysql/test/t/enable_cleartext_plugin-master.opt
 share/mysql/test/t/enable_cleartext_plugin.test
 share/mysql/test/t/endspace.test
+share/mysql/test/t/engine_attribute.test
+share/mysql/test/t/engine_attribute_debug.test
 share/mysql/test/t/eq_range_idx_stat.test
 share/mysql/test/t/error_logging_verbosity-master.opt
 share/mysql/test/t/error_logging_verbosity.test
@@ -18606,7 +20131,9 @@ share/mysql/test/t/func_aes_cfb128.test
 share/mysql/test/t/func_aes_cfb8.test
 share/mysql/test/t/func_aes_misc.test
 share/mysql/test/t/func_aes_ofb.test
+share/mysql/test/t/func_at_time_zone.test
 share/mysql/test/t/func_bitwise_ops.test
+share/mysql/test/t/func_comparison.test
 share/mysql/test/t/func_compress.test
 share/mysql/test/t/func_concat.test
 share/mysql/test/t/func_date_add.test
@@ -18634,6 +20161,7 @@ share/mysql/test/t/func_math.test
 share/mysql/test/t/func_misc.test
 share/mysql/test/t/func_op.test
 share/mysql/test/t/func_prefix_key.test
+share/mysql/test/t/func_rand.test
 share/mysql/test/t/func_regexp.test
 share/mysql/test/t/func_rollback.test
 share/mysql/test/t/func_sapdb.test
@@ -18675,6 +20203,9 @@ share/mysql/test/t/grant_alter_user_qa-master.opt
 share/mysql/test/t/grant_alter_user_qa.test
 share/mysql/test/t/grant_debug.test
 share/mysql/test/t/grant_dynamic.test
+share/mysql/test/t/grant_dynamic_bugs.test
+share/mysql/test/t/grant_dynamic_flush.test
+share/mysql/test/t/grant_dynamic_flush_upgrade.test
 share/mysql/test/t/grant_dynamic_session_variables_admin.test
 share/mysql/test/t/grant_explain_non_select.test
 share/mysql/test/t/grant_lowercase_fs.test
@@ -18690,6 +20221,7 @@ share/mysql/test/t/group_by.test
 share/mysql/test/t/group_by_fd_no_prot.test
 share/mysql/test/t/group_by_fd_ps_prot.test
 share/mysql/test/t/group_min_max.test
+share/mysql/test/t/group_min_max_ext-debug.test
 share/mysql/test/t/group_min_max_ext.test
 share/mysql/test/t/group_min_max_innodb.test
 share/mysql/test/t/group_min_max_ps_protocol.test
@@ -18719,6 +20251,8 @@ share/mysql/test/t/histograms_debug.test
 share/mysql/test/t/host_cache_size_functionality-master.opt
 share/mysql/test/t/host_cache_size_functionality.test
 share/mysql/test/t/hostname_length.test
+share/mysql/test/t/hostname_length_ipv4.test
+share/mysql/test/t/hostname_length_ipv6.test
 share/mysql/test/t/ignore_strict.test
 share/mysql/test/t/implicit_char_to_num_conversion.test
 share/mysql/test/t/implicit_commit.test
@@ -18731,6 +20265,7 @@ share/mysql/test/t/import_symlink-master.opt
 share/mysql/test/t/import_symlink.test
 share/mysql/test/t/inconsistent_scan.test
 share/mysql/test/t/index_merge_bug29952775.test
+share/mysql/test/t/index_merge_bugs.test
 share/mysql/test/t/index_merge_delete.test
 share/mysql/test/t/index_merge_innodb.test
 share/mysql/test/t/index_merge_insert-and-replace.test
@@ -18817,6 +20352,8 @@ share/mysql/test/t/internal_tmp_disk_storage_engine.test
 share/mysql/test/t/invalid_collation-master.opt
 share/mysql/test/t/invalid_collation.test
 share/mysql/test/t/invalid_text_sort.test
+share/mysql/test/t/invisible_columns.test
+share/mysql/test/t/invisible_columns_myisam.test
 share/mysql/test/t/invisible_indexes.test
 share/mysql/test/t/invisible_indexes_myisam.test
 share/mysql/test/t/ipv4_as_ipv6-master.opt
@@ -18849,6 +20386,7 @@ share/mysql/test/t/key_primary.test
 share/mysql/test/t/keywords.test
 share/mysql/test/t/kill.test
 share/mysql/test/t/kill_debug.test
+share/mysql/test/t/kill_explain_analyze.test
 share/mysql/test/t/kill_myisam.test
 share/mysql/test/t/lead_lag.test
 share/mysql/test/t/lead_lag_explain.test
@@ -18916,12 +20454,15 @@ share/mysql/test/t/log_tables_debug.test
 share/mysql/test/t/log_tables_myisam-master.opt
 share/mysql/test/t/log_tables_myisam.test
 share/mysql/test/t/log_tables_upgrade.test
+share/mysql/test/t/log_timestamp_ts-master.opt
+share/mysql/test/t/log_timestamp_ts.test
 share/mysql/test/t/log_timestamps-master.opt
 share/mysql/test/t/log_timestamps.test
 share/mysql/test/t/long_table_name.test
 share/mysql/test/t/long_tmpdir-master.opt
 share/mysql/test/t/long_tmpdir-master.sh
 share/mysql/test/t/long_tmpdir.test
+share/mysql/test/t/loose_scan.test
 share/mysql/test/t/lowercase_fs_off.test
 share/mysql/test/t/lowercase_fs_on.test
 share/mysql/test/t/lowercase_mixed_tmpdir-master.opt
@@ -18959,6 +20500,7 @@ share/mysql/test/t/metadata.test
 share/mysql/test/t/metadata_myisam.test
 share/mysql/test/t/mix2_myisam.test
 share/mysql/test/t/mix2_myisam_ucs2.test
+share/mysql/test/t/mtr_unit_tests.test
 share/mysql/test/t/multi_plugin_load-master.opt
 share/mysql/test/t/multi_plugin_load.test
 share/mysql/test/t/multi_plugin_load_add-master.opt
@@ -18997,6 +20539,7 @@ share/mysql/test/t/myisam_mrr_cost_all.test
 share/mysql/test/t/myisam_mrr_cost_icp.test
 share/mysql/test/t/myisam_mrr_icp.test
 share/mysql/test/t/myisam_mrr_none.test
+share/mysql/test/t/myisam_optimize_table.test
 share/mysql/test/t/myisam_recover-master.opt
 share/mysql/test/t/myisam_recover.test
 share/mysql/test/t/myisam_row_rpl-master.opt
@@ -19009,6 +20552,7 @@ share/mysql/test/t/mysql-bug45236.test
 share/mysql/test/t/mysql.test
 share/mysql/test/t/mysql_57_inplace_upgrade.test
 share/mysql/test/t/mysql_80_inplace_upgrade.test
+share/mysql/test/t/mysql_batch_mode.test
 share/mysql/test/t/mysql_binary_mode.test
 share/mysql/test/t/mysql_client_test-master.opt
 share/mysql/test/t/mysql_client_test.test
@@ -19020,6 +20564,8 @@ share/mysql/test/t/mysql_delimiter.sql
 share/mysql/test/t/mysql_delimiter_19799.sql
 share/mysql/test/t/mysql_delimiter_source.sql
 share/mysql/test/t/mysql_inplace_upgrade.test
+share/mysql/test/t/mysql_load_data_local_dir-master.opt
+share/mysql/test/t/mysql_load_data_local_dir.test
 share/mysql/test/t/mysql_locale_posix.test
 share/mysql/test/t/mysql_not_windows-master.opt
 share/mysql/test/t/mysql_not_windows.test
@@ -19062,6 +20608,7 @@ share/mysql/test/t/mysqld--defaults-file.test
 share/mysql/test/t/mysqld--help-notwin.test
 share/mysql/test/t/mysqld--help-win.test
 share/mysql/test/t/mysqld--validate-config.test
+share/mysql/test/t/mysqld_cmdline_warnings-master.opt
 share/mysql/test/t/mysqld_cmdline_warnings.test
 share/mysql/test/t/mysqld_daemon.test
 share/mysql/test/t/mysqld_safe.sh
@@ -19073,6 +20620,7 @@ share/mysql/test/t/mysqldump-max.test
 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_bug29998457.test
 share/mysql/test/t/mysqldump_bugs.test
 share/mysql/test/t/mysqldump_gtid-master.opt
 share/mysql/test/t/mysqldump_gtid.test
@@ -19098,6 +20646,7 @@ share/mysql/test/t/mysqlshow_ci.test
 share/mysql/test/t/mysqlshow_cs.test
 share/mysql/test/t/mysqlslap.test
 share/mysql/test/t/mysqltest.test
+share/mysql/test/t/mysqltest_escape.test
 share/mysql/test/t/named_pipe-master.opt
 share/mysql/test/t/named_pipe.test
 share/mysql/test/t/negation_elimination.test
@@ -19158,6 +20707,7 @@ share/mysql/test/t/opt_costmodel_upgrade.test
 share/mysql/test/t/opt_costmodel_warnings.test
 share/mysql/test/t/opt_hint_timeout.test
 share/mysql/test/t/opt_hints.test
+share/mysql/test/t/opt_hints_index.test
 share/mysql/test/t/opt_hints_index_merge.test
 share/mysql/test/t/opt_hints_join_order.test
 share/mysql/test/t/opt_hints_join_order_myisam.test
@@ -19175,6 +20725,8 @@ share/mysql/test/t/order_by_none.test
 share/mysql/test/t/order_by_sortkey.test
 share/mysql/test/t/order_fill_sortbuf.test
 share/mysql/test/t/outfile.test
+share/mysql/test/t/outfile_fsync_debug-master.opt
+share/mysql/test/t/outfile_fsync_debug.test
 share/mysql/test/t/outfile_loaddata.test
 share/mysql/test/t/overflow.test
 share/mysql/test/t/packet.test
@@ -19203,6 +20755,7 @@ share/mysql/test/t/partition_debug.test
 share/mysql/test/t/partition_debug_sync.test
 share/mysql/test/t/partition_debug_sync_stmt.test
 share/mysql/test/t/partition_error.test
+share/mysql/test/t/partition_exchange-master.opt
 share/mysql/test/t/partition_exchange.test
 share/mysql/test/t/partition_exchange_myisam.test
 share/mysql/test/t/partition_explicit_prune.test
@@ -19211,12 +20764,15 @@ share/mysql/test/t/partition_grant.test
 share/mysql/test/t/partition_hash.test
 share/mysql/test/t/partition_index_innodb-master.opt
 share/mysql/test/t/partition_index_innodb.test
+share/mysql/test/t/partition_innodb-master.opt
 share/mysql/test/t/partition_innodb.test
 share/mysql/test/t/partition_innodb_plugin.test
 share/mysql/test/t/partition_innodb_semi_consistent-master.opt
 share/mysql/test/t/partition_innodb_semi_consistent.test
 share/mysql/test/t/partition_innodb_stmt.test
+share/mysql/test/t/partition_innodb_tablespace-master.opt
 share/mysql/test/t/partition_innodb_tablespace.test
+share/mysql/test/t/partition_list-master.opt
 share/mysql/test/t/partition_list.test
 share/mysql/test/t/partition_locking-master.opt
 share/mysql/test/t/partition_locking.test
@@ -19229,6 +20785,7 @@ share/mysql/test/t/partition_not_supported.test
 share/mysql/test/t/partition_not_supported_myisam.test
 share/mysql/test/t/partition_not_windows.test
 share/mysql/test/t/partition_order.test
+share/mysql/test/t/partition_prefixkey_upgrade.test
 share/mysql/test/t/partition_pruning.test
 share/mysql/test/t/partition_range.test
 share/mysql/test/t/partition_rename_longfilename.test
@@ -19309,8 +20866,11 @@ share/mysql/test/t/ps_grant.test
 share/mysql/test/t/ps_not_windows.test
 share/mysql/test/t/ps_sys_upgrade-master.opt
 share/mysql/test/t/ps_sys_upgrade.test
+share/mysql/test/t/ps_type_deduction.test
 share/mysql/test/t/ps_w_max_indexes_64.test
 share/mysql/test/t/ps_w_max_indexes_64_myisam.test
+share/mysql/test/t/query_attributes-master.opt
+share/mysql/test/t/query_attributes.test
 share/mysql/test/t/range_all.test
 share/mysql/test/t/range_icp.test
 share/mysql/test/t/range_icp_mrr.test
@@ -19318,6 +20878,7 @@ share/mysql/test/t/range_mrr.test
 share/mysql/test/t/range_mrr_cost.test
 share/mysql/test/t/range_none.test
 share/mysql/test/t/range_with_memory_limit.test
+share/mysql/test/t/read_only-master.opt
 share/mysql/test/t/read_only.test
 share/mysql/test/t/read_only_ddl.test
 share/mysql/test/t/read_only_innodb.test
@@ -19360,6 +20921,8 @@ share/mysql/test/t/rewrite_slow_log-master.opt
 share/mysql/test/t/rewrite_slow_log.test
 share/mysql/test/t/roles-admin.test
 share/mysql/test/t/roles-ddl.test
+share/mysql/test/t/roles-sp-case-master.opt
+share/mysql/test/t/roles-sp-case.test
 share/mysql/test/t/roles-sp.test
 share/mysql/test/t/roles-upgrade.test
 share/mysql/test/t/roles-view.test
@@ -19367,6 +20930,7 @@ share/mysql/test/t/roles.test
 share/mysql/test/t/roles2.test
 share/mysql/test/t/roles_bugs.test
 share/mysql/test/t/roles_bugs_debug.test
+share/mysql/test/t/roles_bugs_wildcard.test
 share/mysql/test/t/rollback.test
 share/mysql/test/t/rollback_myisam.test
 share/mysql/test/t/round.test
@@ -19381,6 +20945,9 @@ share/mysql/test/t/rpl_password_history.test
 share/mysql/test/t/savepoint_debug.test
 share/mysql/test/t/schema.test
 share/mysql/test/t/schema_myisam.test
+share/mysql/test/t/schema_read_only_ci.test
+share/mysql/test/t/schema_read_only_cs.test
+share/mysql/test/t/sdi_tablespace.test
 share/mysql/test/t/sdi_utf8.test
 share/mysql/test/t/secure_file_priv_win-master.opt
 share/mysql/test/t/secure_file_priv_win.test
@@ -19544,6 +21111,8 @@ share/mysql/test/t/subquery_nomat_nosj_bka_nobnl.test
 share/mysql/test/t/subquery_none.test
 share/mysql/test/t/subquery_none_bka.test
 share/mysql/test/t/subquery_none_bka_nobnl.test
+share/mysql/test/t/subquery_scalar_to_derived.test
+share/mysql/test/t/subquery_scalar_to_derived_correlated.test
 share/mysql/test/t/subquery_sj_all-master.opt
 share/mysql/test/t/subquery_sj_all.test
 share/mysql/test/t/subquery_sj_all_bka-master.opt
@@ -19577,6 +21146,7 @@ share/mysql/test/t/subquery_sj_mat_nosj.test
 share/mysql/test/t/subquery_sj_none.test
 share/mysql/test/t/subquery_sj_none_bka.test
 share/mysql/test/t/subquery_sj_none_bka_nobnl.test
+share/mysql/test/t/subquery_table_to_derived.test
 share/mysql/test/t/subselect.test
 share/mysql/test/t/subselect_debug.test
 share/mysql/test/t/subselect_gis.test
@@ -19585,11 +21155,18 @@ share/mysql/test/t/sum_distinct-big.test
 share/mysql/test/t/sum_distinct.test
 share/mysql/test/t/symlink-master.opt
 share/mysql/test/t/symlink.test
+share/mysql/test/t/sync_client.inc
 share/mysql/test/t/synchronization.test
 share/mysql/test/t/sysdate_is_now-master.opt
 share/mysql/test/t/sysdate_is_now.test
 share/mysql/test/t/system_mysql_db.test
 share/mysql/test/t/system_mysql_db_refs.test
+share/mysql/test/t/system_tables_myisam-master.opt
+share/mysql/test/t/system_tables_myisam.test
+share/mysql/test/t/system_tables_myisam_lctn_1-master.opt
+share/mysql/test/t/system_tables_myisam_lctn_1.test
+share/mysql/test/t/system_tables_myisam_lctn_2-master.opt
+share/mysql/test/t/system_tables_myisam_lctn_2.test
 share/mysql/test/t/system_variable_source-master.opt
 share/mysql/test/t/system_variable_source.test
 share/mysql/test/t/table_definition_cache_functionality-master.opt
@@ -19601,6 +21178,7 @@ share/mysql/test/t/table_value_constructor.test
 share/mysql/test/t/tablelock.test
 share/mysql/test/t/tablespace-master.opt
 share/mysql/test/t/tablespace.test
+share/mysql/test/t/tablespace_debug-master.opt
 share/mysql/test/t/tablespace_myisam-master.opt
 share/mysql/test/t/tablespace_myisam.test
 share/mysql/test/t/temp_table-master.opt
@@ -19612,7 +21190,6 @@ share/mysql/test/t/temptable.test
 share/mysql/test/t/temptable_basic.test
 share/mysql/test/t/temptable_disk.test
 share/mysql/test/t/temptable_dump.sql.gz
-share/mysql/test/t/temptable_embedded_unit_tests.test
 share/mysql/test/t/temptable_error_injection.test
 share/mysql/test/t/temptable_fallback.test
 share/mysql/test/t/temptable_myisam.test
@@ -19634,6 +21211,7 @@ share/mysql/test/t/time_zone4.test
 share/mysql/test/t/time_zone_debug.test
 share/mysql/test/t/time_zone_grant.test
 share/mysql/test/t/time_zone_with_dst.test
+share/mysql/test/t/tmpdir.test
 share/mysql/test/t/trans_read_only.test
 share/mysql/test/t/transactional_acl_tables-master.opt
 share/mysql/test/t/transactional_acl_tables.test
@@ -19684,8 +21262,6 @@ share/mysql/test/t/type_varchar.test
 share/mysql/test/t/type_year.test
 share/mysql/test/t/udf-master.opt
 share/mysql/test/t/udf.test
-share/mysql/test/t/udf_myisam-master.opt
-share/mysql/test/t/udf_myisam.test
 share/mysql/test/t/udf_services-master.opt
 share/mysql/test/t/udf_services.test
 share/mysql/test/t/udf_skip_grants-master.opt
@@ -19697,11 +21273,14 @@ share/mysql/test/t/union.test
 share/mysql/test/t/union_myisam.test
 share/mysql/test/t/unique_option_prefixes.test
 share/mysql/test/t/unsafe_binlog_innodb.test
+share/mysql/test/t/upd_del_single_to_multi.test
 share/mysql/test/t/update.test
 share/mysql/test/t/update_myisam.test
 share/mysql/test/t/upgrade.test
+share/mysql/test/t/upgrade_system_tables.test
 share/mysql/test/t/user_account_password_lock.test
 share/mysql/test/t/user_account_password_lock_dbug.test
+share/mysql/test/t/user_comment.test
 share/mysql/test/t/user_if_exists.test
 share/mysql/test/t/user_limits.test
 share/mysql/test/t/user_lock.test
@@ -19714,6 +21293,7 @@ share/mysql/test/t/validate_password_component-master.opt
 share/mysql/test/t/validate_password_component.test
 share/mysql/test/t/validate_password_component_check_user-master.opt
 share/mysql/test/t/validate_password_component_check_user.test
+share/mysql/test/t/validate_password_component_random_password-master.opt
 share/mysql/test/t/validate_password_component_random_password.test
 share/mysql/test/t/validate_password_plugin-master.opt
 share/mysql/test/t/validate_password_plugin.test
@@ -19774,6 +21354,7 @@ share/mysql/test/t/xa_mdl_backup.test
 share/mysql/test/t/xa_prepared_binlog_off-master.opt
 share/mysql/test/t/xa_prepared_binlog_off.test
 share/mysql/test/t/xml.test
+share/mysql/test/t/xml_report_invalid_chars.test
 share/mysql/test/t/year-csv.test
 share/mysql/test/t/year-innodb.test
 share/mysql/test/t/year-memory.test


Home | Main Index | Thread Index | Old Index