mariadb104(-client,-server): update to 10.4.18

[nia <nia%netbsd.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Wed Apr 28 11:17:36 2021 +0200
Changeset:	40da179f4237d00e72adbb38f2c867f6fafb4759

Modified Files:
	mariadb104-client/Makefile.common
	mariadb104-client/PLIST
	mariadb104-client/buildlink3.mk
	mariadb104-client/distinfo
	mariadb104-client/options.mk
	mariadb104-client/patches/patch-CMakeLists.txt
	mariadb104-client/patches/patch-plugin_auth__pam_CMakeLists.txt
	mariadb104-client/patches/patch-scripts_CMakeLists.txt
	mariadb104-client/patches/patch-storage_rocksdb_rocksdb_Makefile
	mariadb104-server/PLIST
	mariadb104-server/PLIST.embedded
Added Files:
	mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake
	mariadb104-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh

Log Message:
mariadb104(-client,-server): update to 10.4.18

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

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

diffstat:
 mariadb104-client/Makefile.common                  |   5 +-
 mariadb104-client/PLIST                            |   9 +-
 mariadb104-client/buildlink3.mk                    |   7 +-
 mariadb104-client/distinfo                         |  18 +-
 mariadb104-client/options.mk                       |   2 +-
 mariadb104-client/patches/patch-CMakeLists.txt     |  14 +-
 .../patch-libmariadb_cmake_ConnectorName.cmake     |  15 +
 .../patches/patch-plugin_auth__pam_CMakeLists.txt  |  12 +-
 .../patches/patch-scripts_CMakeLists.txt           |  30 +-
 .../patches/patch-storage_rocksdb_rocksdb_Makefile |  13 +-
 ...ksdb_rocksdb_build__tools_fb__compile__mongo.sh |  15 +
 mariadb104-server/PLIST                            | 438 +++++++++++++++++----
 mariadb104-server/PLIST.embedded                   |   1 -
 13 files changed, 448 insertions(+), 131 deletions(-)

diffs:
diff --git a/mariadb104-client/Makefile.common b/mariadb104-client/Makefile.common
index 93d6cdf9e9..42bc283902 100644
--- a/mariadb104-client/Makefile.common
+++ b/mariadb104-client/Makefile.common
@@ -3,9 +3,10 @@
 # used by wip/mariadb104-client/Makefile
 # used by wip/mariadb104-server/Makefile
 
-DISTNAME=	mariadb-10.4.12
+DISTNAME=	mariadb-10.4.18
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.org/f/${DISTNAME}/source/
+MASTER_SITES+=	https://archive.mariadb.org/${DISTNAME}/source/
 
 MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://mariadb.org/
@@ -87,7 +88,7 @@ REPLACE_PERL+=		sql-bench/*.sh
 
 SUBST_CLASSES+=		perl
 SUBST_STAGE.perl=	pre-configure
-SUBST_FILES.perl=	${WRKSRC}/scripts/CMakeLists.txt
+SUBST_FILES.perl=	scripts/CMakeLists.txt
 SUBST_SED.perl=		-e "s,/usr/bin/perl,${TOOLS_PATH.perl},g"
 SUBST_SED.perl+=	-e "s,/usr/local/bin/perl,${TOOLS_PATH.perl},g"
 
diff --git a/mariadb104-client/PLIST b/mariadb104-client/PLIST
index 3247bdda4d..b985f16907 100644
--- a/mariadb104-client/PLIST
+++ b/mariadb104-client/PLIST
@@ -7,7 +7,6 @@ bin/mariadb-check
 bin/mariadb-dump
 bin/mariadb-find-rows
 bin/mariadb-import
-bin/mariadb-install-db
 bin/mariadb-plugin
 bin/mariadb-show
 bin/mariadb-slap
@@ -29,7 +28,6 @@ bin/mysqlshow
 bin/mysqlslap
 bin/mysqltest
 bin/mytop
-bin/wsrep_sst_rsync_wan
 include/mysql/errmsg.h
 include/mysql/ma_list.h
 include/mysql/ma_pvio.h
@@ -144,11 +142,12 @@ include/mysql/server/private/dur_prop.h
 include/mysql/server/private/ft_global.h
 include/mysql/server/private/hash.h
 include/mysql/server/private/heap.h
-include/mysql/server/private/intrusive_list.h
+include/mysql/server/private/ilist.h
 include/mysql/server/private/lf.h
 include/mysql/server/private/maria.h
 include/mysql/server/private/my_alarm.h
 include/mysql/server/private/my_atomic.h
+include/mysql/server/private/my_atomic_wrapper.h
 include/mysql/server/private/my_base.h
 include/mysql/server/private/my_bit.h
 include/mysql/server/private/my_bitmap.h
@@ -183,8 +182,10 @@ include/mysql/server/private/probes_mysql.h
 include/mysql/server/private/probes_mysql_nodtrace.h
 include/mysql/server/private/queues.h
 include/mysql/server/private/rijndael.h
+include/mysql/server/private/scope.h
 include/mysql/server/private/service_versions.h
 include/mysql/server/private/source_revision.h
+include/mysql/server/private/span.h
 include/mysql/server/private/ssl_compat.h
 include/mysql/server/private/t_ctype.h
 include/mysql/server/private/thr_alarm.h
@@ -303,8 +304,6 @@ man/man1/perror.1
 man/man1/replace.1
 man/man1/resolve_stack_dump.1
 man/man1/resolveip.1
-man/man1/tokuft_logprint.1
-man/man1/tokuftdump.1
 man/man1/wsrep_sst_common.1
 man/man1/wsrep_sst_mariabackup.1
 man/man1/wsrep_sst_mysqldump.1
diff --git a/mariadb104-client/buildlink3.mk b/mariadb104-client/buildlink3.mk
index db1688387d..7e4b9d4fdf 100644
--- a/mariadb104-client/buildlink3.mk
+++ b/mariadb104-client/buildlink3.mk
@@ -11,7 +11,12 @@ BUILDLINK_PKGSRCDIR.mariadb-client?=	../../wip/mariadb104-client
 BUILDLINK_INCDIRS.mariadb-client+=	include/mysql
 BUILDLINK_LIBDIRS.mariadb-client+=	lib
 
-.include "../../security/openssl/buildlink3.mk"
+pkgbase := mariadb-client
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.mariadb-client:Mssl}
+.  include "../../security/openssl/buildlink3.mk"
+.endif
 .include "../../devel/zlib/buildlink3.mk"
 .endif # MARIADB_CLIENT_BUILDLINK3_MK
 
diff --git a/mariadb104-client/distinfo b/mariadb104-client/distinfo
index 1065fc6a43..567b556fbd 100644
--- a/mariadb104-client/distinfo
+++ b/mariadb104-client/distinfo
@@ -1,23 +1,25 @@
 $NetBSD$
 
-SHA1 (mariadb-10.4.12.tar.gz) = 8a07057e1249c66c7cb11a92936d45ef242581b1
-RMD160 (mariadb-10.4.12.tar.gz) = 1e7557957e163fe350b093794912c9d9294fda84
-SHA512 (mariadb-10.4.12.tar.gz) = 518dae18c04a1f7fcc6fd4d2dfbfbfbdf5e83e72ca41e66e1074328df8d92ab41b458e6a9973771419ac09a7348f264f158916cd198c335085d6e823e707bbc6
-Size (mariadb-10.4.12.tar.gz) = 79120835 bytes
+SHA1 (mariadb-10.4.18.tar.gz) = 82454d8f04c8728ba9df3cefd25747da7dfc25bb
+RMD160 (mariadb-10.4.18.tar.gz) = b60d4820bab723851510e873daef8dae42b120bd
+SHA512 (mariadb-10.4.18.tar.gz) = 085c2468484d997facb021ea7cba4895729b6c5769d715e30cf1dfd62c3a291e5025774420ed278f9470de20be8d3537f03c7d1cc5482d957bc91eb072cd9c12
+Size (mariadb-10.4.18.tar.gz) = 81733656 bytes
 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f
-SHA1 (patch-CMakeLists.txt) = 3f3a5fa151b5f51a7521ef6ee295c081f1dc5d60
+SHA1 (patch-CMakeLists.txt) = 5d7ca07065d13435157bf063d93e744223bed12e
 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad
 SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403
+SHA1 (patch-libmariadb_cmake_ConnectorName.cmake) = 57f891c4bd035afb4aa0b03c269ce859456e9f46
 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66
-SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = b941343898ddc175818b161021fb7fccccee3e28
-SHA1 (patch-scripts_CMakeLists.txt) = afbab5f9c8044adb63f0e770802c67376a5f64e9
+SHA1 (patch-plugin_auth__pam_CMakeLists.txt) = 033f01c64014c0e61bc635d5fbe686f7a4b7f317
+SHA1 (patch-scripts_CMakeLists.txt) = 69d7adc8d50a23aeda4b9d9809cf64f6293703e0
 SHA1 (patch-scripts_mysqld__safe.sh) = 4124e4c8df1527049f5eec9f3d2d4bbe80e7c33f
 SHA1 (patch-sql_mysqld.cc) = 21f9ea79ca90a78f18598d55f209a1835b95858f
 SHA1 (patch-sql_threadpool__generic.cc) = 73df368457a2e88f3cc3221031e565c4208b87ab
 SHA1 (patch-storage_connect_tabvct.cpp) = 2e3c7cd7e4b0a86d443da47d3cc514b8b276d836
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.cc) = 85ee5007cfda0d3070ec20b2b774738b01f8e083
 SHA1 (patch-storage_rocksdb_rdb__io__watchdog.h) = d790c092d7d35d014c5ef209635c18614c3a8301
-SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = bc46f2991c66c20bf323a1d3c271a0ef329aafb0
+SHA1 (patch-storage_rocksdb_rocksdb_Makefile) = 67ea4d154f4f623fdca739f50b236c973e118a12
+SHA1 (patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh) = 3b632521c23765c39f4638dc7a80d04b9e1d58bd
 SHA1 (patch-storage_tokudb_PerconaFT_portability_file.cc) = 830b4c6b20713c811fcd847c1e1abfd8441d0d4a
 SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__htod.h) = 66635f0f79310bb3b2975c64ba6432e9a40ece70
 SHA1 (patch-storage_tokudb_PerconaFT_portability_toku__portability.h) = 75ede1251371eb467901a59672d39443d8c28031
diff --git a/mariadb104-client/options.mk b/mariadb104-client/options.mk
index 749a8bd68c..4083a29301 100644
--- a/mariadb104-client/options.mk
+++ b/mariadb104-client/options.mk
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.mariadb104
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mariadb-client
 
 PKG_SUPPORTED_OPTIONS+=	embedded-server ssl
 PKG_SUGGESTED_OPTIONS+=	embedded-server ssl
diff --git a/mariadb104-client/patches/patch-CMakeLists.txt b/mariadb104-client/patches/patch-CMakeLists.txt
index cc9d6d9cb5..8cd5e717f8 100644
--- a/mariadb104-client/patches/patch-CMakeLists.txt
+++ b/mariadb104-client/patches/patch-CMakeLists.txt
@@ -2,14 +2,18 @@ $NetBSD$
 
 Allow building a server-only configuration.
 
---- CMakeLists.txt.orig	2020-01-26 20:43:49.000000000 +0000
+--- CMakeLists.txt.orig	2021-02-18 23:22:28.000000000 +0000
 +++ CMakeLists.txt
-@@ -400,24 +400,30 @@ ENDIF()
+@@ -405,8 +405,6 @@ ENDIF()
  
  SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
  
 -INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
 -
+ INCLUDE(cpack_rpm)
+ INCLUDE(cpack_deb)
+ 
+@@ -416,19 +414,27 @@ MARK_AS_ADVANCED(PYTHON_SHEBANG)
  # Add storage engines and plugins.
  CONFIGURE_PLUGINS()
  
@@ -33,14 +37,14 @@ Allow building a server-only configuration.
 +  INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb)
 +  ADD_SUBDIRECTORY(include)
 +  ADD_SUBDIRECTORY(client)
-   ADD_SUBDIRECTORY(tests)
-+  ADD_SUBDIRECTORY(scripts)
 +  ADD_SUBDIRECTORY(man)
++  ADD_SUBDIRECTORY(scripts)
+   ADD_SUBDIRECTORY(tests)
 +ELSE()
    ADD_SUBDIRECTORY(sql)
    OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
    IF(WITH_EMBEDDED_SERVER) 
-@@ -435,21 +441,14 @@ IF(NOT WITHOUT_SERVER)
+@@ -446,21 +452,14 @@ IF(NOT WITHOUT_SERVER)
    ENDIF()
  ENDIF()
  
diff --git a/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake b/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake
new file mode 100644
index 0000000000..22c7f82b7b
--- /dev/null
+++ b/mariadb104-client/patches/patch-libmariadb_cmake_ConnectorName.cmake
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Fix control flow.
+
+--- libmariadb/cmake/ConnectorName.cmake.orig	2021-02-18 23:22:28.000000000 +0000
++++ libmariadb/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/mariadb104-client/patches/patch-plugin_auth__pam_CMakeLists.txt b/mariadb104-client/patches/patch-plugin_auth__pam_CMakeLists.txt
index 3fd70458e9..3bd48141a6 100644
--- a/mariadb104-client/patches/patch-plugin_auth__pam_CMakeLists.txt
+++ b/mariadb104-client/patches/patch-plugin_auth__pam_CMakeLists.txt
@@ -2,17 +2,9 @@ $NetBSD$
 
 Check for pam_ext.h (not available on NetBSD).
 
---- plugin/auth_pam/CMakeLists.txt.orig	2020-01-26 20:43:53.000000000 +0000
+--- plugin/auth_pam/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
 +++ plugin/auth_pam/CMakeLists.txt
-@@ -2,6 +2,7 @@ INCLUDE (CheckIncludeFiles)
- INCLUDE (CheckFunctionExists)
- 
- CHECK_INCLUDE_FILES (security/pam_appl.h HAVE_PAM_APPL_H)
-+CHECK_INCLUDE_FILES (security/pam_ext.h HAVE_PAM_EXT_H)
- CHECK_FUNCTION_EXISTS (strndup HAVE_STRNDUP)
- 
- IF(HAVE_PAM_APPL_H)
-@@ -21,7 +22,7 @@ IF(HAVE_PAM_APPL_H)
+@@ -43,7 +43,7 @@ IF(HAVE_PAM_APPL_H)
                       WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
                     COMPONENT Server)
    ENDIF()
diff --git a/mariadb104-client/patches/patch-scripts_CMakeLists.txt b/mariadb104-client/patches/patch-scripts_CMakeLists.txt
index 2aac229472..ed2822a4fb 100644
--- a/mariadb104-client/patches/patch-scripts_CMakeLists.txt
+++ b/mariadb104-client/patches/patch-scripts_CMakeLists.txt
@@ -4,7 +4,7 @@ Install missing scripts.
 
 We install all scripts with the client, for Reasons.
 
---- scripts/CMakeLists.txt.orig	2020-01-26 20:43:53.000000000 +0000
+--- scripts/CMakeLists.txt.orig	2021-02-18 23:22:29.000000000 +0000
 +++ scripts/CMakeLists.txt
 @@ -91,7 +91,7 @@ SET(ADD_GIS_SP_EOL ";")
  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/maria_add_gis_sp.sql.in
@@ -24,18 +24,6 @@ We install all scripts with the client, for Reasons.
  )
  ENDIF()
  
-@@ -122,9 +122,9 @@ ENDIF()
- 
- 
- IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
--  SET (PERL_PATH "/usr/local/bin/perl")
-+  SET (PERL_PATH "/usr/pkg/bin/perl")
- ELSE()
--  SET (PERL_PATH "/usr/bin/perl")
-+  SET (PERL_PATH "/usr/pkg/bin/perl")
- ENDIF()
- 
- IF(UNIX)
 @@ -202,10 +202,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DI
    COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db
    )
@@ -49,9 +37,21 @@ We install all scripts with the client, for Reasons.
    )
  ENDIF()
  
-@@ -282,7 +281,7 @@ ELSE()
-       wsrep_sst_common
+@@ -296,7 +295,6 @@ ELSE()
+     INSTALL(
+       FILES  ${wsrep_sst_rsync_wan}
+       DESTINATION ${INSTALL_BINDIR}
+-      COMPONENT Server
      )
+ 
+     FOREACH(file ${WSREP_SOURCE})
+@@ -308,11 +306,10 @@ ELSE()
+       INSTALL(FILES
+         ${CMAKE_CURRENT_BINARY_DIR}/${file}
+         DESTINATION ${INSTALL_BINDIR}
+-        COMPONENT ${${file}_COMPONENT}
+        )
+     ENDFOREACH()
    ENDIF()
 -  IF (NOT WITHOUT_SERVER)
 +  IF (TRUE)
diff --git a/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_Makefile b/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_Makefile
index b6c57f39d6..7c62af31b0 100644
--- a/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_Makefile
+++ b/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_Makefile
@@ -2,9 +2,18 @@ $NetBSD$
 
 Shell portability.
 
---- storage/rocksdb/rocksdb/Makefile.orig	2020-01-26 20:43:50.000000000 +0000
+--- storage/rocksdb/rocksdb/Makefile.orig	2021-02-18 23:22:28.000000000 +0000
 +++ storage/rocksdb/rocksdb/Makefile
-@@ -1830,7 +1830,7 @@ rocksdbjavastatic: $(java_static_all_lib
+@@ -911,7 +911,7 @@ valgrind_check_0:
+ 	  | grep -E '$(tests-regexp)'					\
+ 	  | grep -E -v '$(valgrind-blacklist-regexp)'					\
+ 	  | build_tools/gnu_parallel -j$(J) --plain --joblog=LOG $$eta --gnu \
+-	  '(if [[ "{}" == "./"* ]] ; then $(DRIVER) {}; else {}; fi) ' \
++	  '(if [ "{}" = "./"* ] ; then $(DRIVER) {}; else {}; fi) ' \
+ 	  '>& t/valgrind_log-{/}'
+ 
+ CLEAN_FILES += t LOG $(TMPD)
+@@ -1952,7 +1952,7 @@ rocksdbjavastatic: $(java_static_all_lib
  	  -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
  	  $(java_static_all_libobjects) $(COVERAGEFLAGS) \
  	  $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
diff --git a/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh b/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh
new file mode 100644
index 0000000000..2d1718625e
--- /dev/null
+++ b/mariadb104-client/patches/patch-storage_rocksdb_rocksdb_build__tools_fb__compile__mongo.sh
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Shell portability.
+
+--- storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh.orig	2021-02-18 23:22:28.000000000 +0000
++++ storage/rocksdb/rocksdb/build_tools/fb_compile_mongo.sh
+@@ -13,7 +13,7 @@ EXTRA_LDFLAGS=""
+ if test -z $ALLOC; then
+   # default
+   ALLOC=tcmalloc
+-elif [[ $ALLOC == "jemalloc" ]]; then
++elif [ $ALLOC = "jemalloc" ]; then
+   ALLOC=system
+   EXTRA_LDFLAGS+=" -Wl,--whole-archive $JEMALLOC_LIB -Wl,--no-whole-archive"
+ fi
diff --git a/mariadb104-server/PLIST b/mariadb104-server/PLIST
index f95667a15d..2f11e67712 100644
--- a/mariadb104-server/PLIST
+++ b/mariadb104-server/PLIST
@@ -27,7 +27,6 @@ bin/replace
 bin/resolve_stack_dump
 bin/resolveip
 bin/sst_dump
-data/test/db.opt
 include/mysql/server/private/authors.h
 include/mysql/server/private/backup.h
 include/mysql/server/private/bounded_queue.h
@@ -200,6 +199,7 @@ include/mysql/server/private/sql_profile.h
 include/mysql/server/private/sql_reload.h
 include/mysql/server/private/sql_rename.h
 include/mysql/server/private/sql_repl.h
+include/mysql/server/private/sql_schema.h
 include/mysql/server/private/sql_select.h
 include/mysql/server/private/sql_sequence.h
 include/mysql/server/private/sql_servers.h
@@ -584,7 +584,6 @@ share/mysql/test/include/galera_diff.inc
 share/mysql/test/include/galera_end.inc
 share/mysql/test/include/galera_have_debug_sync.inc
 share/mysql/test/include/galera_init.inc
-share/mysql/test/include/galera_resume.inc
 share/mysql/test/include/galera_set_sync_point.inc
 share/mysql/test/include/galera_signal_sync_point.inc
 share/mysql/test/include/galera_suspend.inc
@@ -640,7 +639,6 @@ share/mysql/test/include/have_eucjpms.inc
 share/mysql/test/include/have_euckr.inc
 share/mysql/test/include/have_example_plugin.inc
 share/mysql/test/include/have_file_key_management.inc
-share/mysql/test/include/have_garbd.inc
 share/mysql/test/include/have_gb2312.inc
 share/mysql/test/include/have_gbk.inc
 share/mysql/test/include/have_geometry.inc
@@ -702,6 +700,7 @@ share/mysql/test/include/have_ssl_communication.inc
 share/mysql/test/include/have_ssl_crypto_functs.inc
 share/mysql/test/include/have_stat_tables.inc
 share/mysql/test/include/have_stat_tables.opt
+share/mysql/test/include/have_static_innodb.inc
 share/mysql/test/include/have_symlink.inc
 share/mysql/test/include/have_symlink.require
 share/mysql/test/include/have_tis620.inc
@@ -723,6 +722,7 @@ share/mysql/test/include/have_wsrep.inc
 share/mysql/test/include/have_wsrep_enabled.inc
 share/mysql/test/include/have_wsrep_provider.inc
 share/mysql/test/include/have_xtrabackup.inc
+share/mysql/test/include/icp_debug_kill.inc
 share/mysql/test/include/icp_tests.inc
 share/mysql/test/include/implicit_commit_helper.inc
 share/mysql/test/include/index_merge1.inc
@@ -741,6 +741,8 @@ share/mysql/test/include/innodb_page_size.combinations
 share/mysql/test/include/innodb_page_size.inc
 share/mysql/test/include/innodb_page_size_small.combinations
 share/mysql/test/include/innodb_page_size_small.inc
+share/mysql/test/include/innodb_prefix_index_cluster_optimization.combinations
+share/mysql/test/include/innodb_prefix_index_cluster_optimization.inc
 share/mysql/test/include/innodb_rollback_on_timeout.inc
 share/mysql/test/include/innodb_row_format.combinations
 share/mysql/test/include/innodb_row_format.inc
@@ -805,7 +807,6 @@ share/mysql/test/include/not_ssl.inc
 share/mysql/test/include/not_staging.inc
 share/mysql/test/include/not_staging.require
 share/mysql/test/include/not_threadpool.inc
-share/mysql/test/include/not_true.require
 share/mysql/test/include/not_valgrind.inc
 share/mysql/test/include/not_valgrind.require
 share/mysql/test/include/not_var_link.inc
@@ -836,6 +837,7 @@ share/mysql/test/include/reset_master_slave.inc
 share/mysql/test/include/restart_mysqld.inc
 share/mysql/test/include/restart_slave_sql.inc
 share/mysql/test/include/restore_charset.inc
+share/mysql/test/include/rowid_filter_debug_kill.inc
 share/mysql/test/include/rowid_order.inc
 share/mysql/test/include/rpl_assert.inc
 share/mysql/test/include/rpl_change_topology.inc
@@ -929,6 +931,7 @@ share/mysql/test/include/wait_condition_sp.inc
 share/mysql/test/include/wait_condition_with_debug.inc
 share/mysql/test/include/wait_for_binlog_checkpoint.inc
 share/mysql/test/include/wait_for_binlog_event.inc
+share/mysql/test/include/wait_for_line_count_in_file.inc
 share/mysql/test/include/wait_for_purge.inc
 share/mysql/test/include/wait_for_query_to_fail.inc
 share/mysql/test/include/wait_for_query_to_succeed.inc
@@ -1002,6 +1005,7 @@ 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/openssl.cnf
 share/mysql/test/lib/process-purecov-annotations.pl
 share/mysql/test/lib/v1/My/Config.pm
 share/mysql/test/lib/v1/incompatible.tests
@@ -1065,6 +1069,8 @@ share/mysql/test/main/analyze_stmt_slow_query_log.result
 share/mysql/test/main/analyze_stmt_slow_query_log.test
 share/mysql/test/main/ansi.result
 share/mysql/test/main/ansi.test
+share/mysql/test/main/aria_icp_debug.result
+share/mysql/test/main/aria_icp_debug.test
 share/mysql/test/main/assign_key_cache.result
 share/mysql/test/main/assign_key_cache.test
 share/mysql/test/main/assign_key_cache_debug.result
@@ -1117,6 +1123,8 @@ share/mysql/test/main/bool.test
 share/mysql/test/main/bootstrap-master.opt
 share/mysql/test/main/bootstrap.result
 share/mysql/test/main/bootstrap.test
+share/mysql/test/main/bootstrap_innodb.result
+share/mysql/test/main/bootstrap_innodb.test
 share/mysql/test/main/brackets.result
 share/mysql/test/main/brackets.test
 share/mysql/test/main/bug12427262.result
@@ -1279,6 +1287,8 @@ share/mysql/test/main/cte_grant.result
 share/mysql/test/main/cte_grant.test
 share/mysql/test/main/cte_nonrecursive.result
 share/mysql/test/main/cte_nonrecursive.test
+share/mysql/test/main/cte_nonrecursive_not_embedded.result
+share/mysql/test/main/cte_nonrecursive_not_embedded.test
 share/mysql/test/main/cte_recursive.result
 share/mysql/test/main/cte_recursive.test
 share/mysql/test/main/cte_recursive_not_embedded.result
@@ -1754,6 +1764,8 @@ share/mysql/test/main/grant_lowercase_fs.result
 share/mysql/test/main/grant_lowercase_fs.test
 share/mysql/test/main/grant_not_windows.result
 share/mysql/test/main/grant_not_windows.test
+share/mysql/test/main/grant_repair.result
+share/mysql/test/main/grant_repair.test
 share/mysql/test/main/greedy_optimizer.result
 share/mysql/test/main/greedy_optimizer.test
 share/mysql/test/main/group_by.result
@@ -1841,12 +1853,16 @@ share/mysql/test/main/init_file_set_password-7656.result
 share/mysql/test/main/init_file_set_password-7656.test
 share/mysql/test/main/innodb_bug878769.result
 share/mysql/test/main/innodb_bug878769.test
+share/mysql/test/main/innodb_ext_key,off.rdiff
+share/mysql/test/main/innodb_ext_key.combinations
 share/mysql/test/main/innodb_ext_key.result
 share/mysql/test/main/innodb_ext_key.test
 share/mysql/test/main/innodb_group.result
 share/mysql/test/main/innodb_group.test
 share/mysql/test/main/innodb_icp.result
 share/mysql/test/main/innodb_icp.test
+share/mysql/test/main/innodb_icp_debug.result
+share/mysql/test/main/innodb_icp_debug.test
 share/mysql/test/main/innodb_ignore_builtin-master.opt
 share/mysql/test/main/innodb_ignore_builtin.result
 share/mysql/test/main/innodb_ignore_builtin.test
@@ -1953,6 +1969,7 @@ share/mysql/test/main/loaddata_autocom_innodb.result
 share/mysql/test/main/loaddata_autocom_innodb.test
 share/mysql/test/main/loadxml.result
 share/mysql/test/main/loadxml.test
+share/mysql/test/main/locale.opt
 share/mysql/test/main/locale.result
 share/mysql/test/main/locale.test
 share/mysql/test/main/lock.result
@@ -1971,6 +1988,8 @@ share/mysql/test/main/lock_tables_lost_commit.result
 share/mysql/test/main/lock_tables_lost_commit.test
 share/mysql/test/main/lock_user.result
 share/mysql/test/main/lock_user.test
+share/mysql/test/main/lock_view.result
+share/mysql/test/main/lock_view.test
 share/mysql/test/main/locked_temporary-5955.result
 share/mysql/test/main/locked_temporary-5955.test
 share/mysql/test/main/log_errchk.result
@@ -2049,6 +2068,9 @@ share/mysql/test/main/max_password_errors.result
 share/mysql/test/main/max_password_errors.test
 share/mysql/test/main/max_statement_time.result
 share/mysql/test/main/max_statement_time.test
+share/mysql/test/main/mdev-21101.opt
+share/mysql/test/main/mdev-21101.result
+share/mysql/test/main/mdev-21101.test
 share/mysql/test/main/mdev-504.result
 share/mysql/test/main/mdev-504.test
 share/mysql/test/main/mdev13607.result
@@ -2063,6 +2085,8 @@ share/mysql/test/main/mdev_14586.result
 share/mysql/test/main/mdev_14586.test
 share/mysql/test/main/mdev_19276.result
 share/mysql/test/main/mdev_19276.test
+share/mysql/test/main/mdev_22370.result
+share/mysql/test/main/mdev_22370.test
 share/mysql/test/main/mdl.result
 share/mysql/test/main/mdl.test
 share/mysql/test/main/mdl_sync-master.opt
@@ -2130,6 +2154,8 @@ share/mysql/test/main/myisam_explain_non_select_all.result
 share/mysql/test/main/myisam_explain_non_select_all.test
 share/mysql/test/main/myisam_icp.result
 share/mysql/test/main/myisam_icp.test
+share/mysql/test/main/myisam_icp_debug.result
+share/mysql/test/main/myisam_icp_debug.test
 share/mysql/test/main/myisam_icp_notembedded.result
 share/mysql/test/main/myisam_icp_notembedded.test
 share/mysql/test/main/myisam_mrr,32bit.rdiff
@@ -2140,6 +2166,8 @@ share/mysql/test/main/myisam_optimize.test
 share/mysql/test/main/myisam_recover-master.opt
 share/mysql/test/main/myisam_recover.result
 share/mysql/test/main/myisam_recover.test
+share/mysql/test/main/myisam_repair.result
+share/mysql/test/main/myisam_repair.test
 share/mysql/test/main/myisampack.result
 share/mysql/test/main/myisampack.test
 share/mysql/test/main/mysql-bug41486.result
@@ -2243,6 +2271,9 @@ share/mysql/test/main/mysqldump-nl.test
 share/mysql/test/main/mysqldump-no-binlog-master.opt
 share/mysql/test/main/mysqldump-no-binlog.result
 share/mysql/test/main/mysqldump-no-binlog.test
+share/mysql/test/main/mysqldump-system,win.rdiff
+share/mysql/test/main/mysqldump-system.result
+share/mysql/test/main/mysqldump-system.test
 share/mysql/test/main/mysqldump-utf8mb4.result
 share/mysql/test/main/mysqldump-utf8mb4.test
 share/mysql/test/main/mysqldump.opt
@@ -2272,6 +2303,8 @@ share/mysql/test/main/named_pipe.result
 share/mysql/test/main/named_pipe.test
 share/mysql/test/main/negation_elimination.result
 share/mysql/test/main/negation_elimination.test
+share/mysql/test/main/nested_profiling.result
+share/mysql/test/main/nested_profiling.test
 share/mysql/test/main/no-threads-master.opt
 share/mysql/test/main/no-threads.result
 share/mysql/test/main/no-threads.test
@@ -2342,8 +2375,6 @@ share/mysql/test/main/parser_bug21114_innodb.result
 share/mysql/test/main/parser_bug21114_innodb.test
 share/mysql/test/main/parser_not_embedded.result
 share/mysql/test/main/parser_not_embedded.test
-share/mysql/test/main/parser_precedence.result
-share/mysql/test/main/parser_precedence.test
 share/mysql/test/main/parser_stack.result
 share/mysql/test/main/parser_stack.test
 share/mysql/test/main/partition-master.opt
@@ -2498,6 +2529,10 @@ share/mysql/test/main/plugin_vars.test
 share/mysql/test/main/pool_of_threads.cnf
 share/mysql/test/main/pool_of_threads.result
 share/mysql/test/main/pool_of_threads.test
+share/mysql/test/main/precedence.result
+share/mysql/test/main/precedence.test
+share/mysql/test/main/precedence_bugs.result
+share/mysql/test/main/precedence_bugs.test
 share/mysql/test/main/preload.result
 share/mysql/test/main/preload.test
 share/mysql/test/main/prepare.result
@@ -2546,6 +2581,8 @@ share/mysql/test/main/ps_not_windows.result
 share/mysql/test/main/ps_not_windows.test
 share/mysql/test/main/ps_qc_innodb.result
 share/mysql/test/main/ps_qc_innodb.test
+share/mysql/test/main/ps_show_log.result
+share/mysql/test/main/ps_show_log.test
 share/mysql/test/main/query_cache.result
 share/mysql/test/main/query_cache.test
 share/mysql/test/main/query_cache_28249.result
@@ -2577,6 +2614,8 @@ share/mysql/test/main/range_interrupted-13751.result
 share/mysql/test/main/range_interrupted-13751.test
 share/mysql/test/main/range_mrr_icp.result
 share/mysql/test/main/range_mrr_icp.test
+share/mysql/test/main/range_notembedded.result
+share/mysql/test/main/range_notembedded.test
 share/mysql/test/main/range_vs_index_merge.result
 share/mysql/test/main/range_vs_index_merge.test
 share/mysql/test/main/range_vs_index_merge_innodb.result
@@ -2618,8 +2657,16 @@ share/mysql/test/main/rowid_filter.result
 share/mysql/test/main/rowid_filter.test
 share/mysql/test/main/rowid_filter_innodb.result
 share/mysql/test/main/rowid_filter_innodb.test
+share/mysql/test/main/rowid_filter_innodb_debug.result
+share/mysql/test/main/rowid_filter_innodb_debug.test
+share/mysql/test/main/rowid_filter_myisam.result
+share/mysql/test/main/rowid_filter_myisam.test
+share/mysql/test/main/rowid_filter_myisam_debug.result
+share/mysql/test/main/rowid_filter_myisam_debug.test
 share/mysql/test/main/rowid_order_innodb.result
 share/mysql/test/main/rowid_order_innodb.test
+share/mysql/test/main/rpl_mysql_upgrade_slave_repo_check.result
+share/mysql/test/main/rpl_mysql_upgrade_slave_repo_check.test
 share/mysql/test/main/rpl_mysqldump_slave.result
 share/mysql/test/main/rpl_mysqldump_slave.test
 share/mysql/test/main/schema.result
@@ -2708,7 +2755,7 @@ share/mysql/test/main/single_delete_update.result
 share/mysql/test/main/single_delete_update.test
 share/mysql/test/main/single_delete_update_innodb.result
 share/mysql/test/main/single_delete_update_innodb.test
-share/mysql/test/main/skip_grants-master.opt
+share/mysql/test/main/skip_grants.opt
 share/mysql/test/main/skip_grants.result
 share/mysql/test/main/skip_grants.test
 share/mysql/test/main/skip_log_bin-master.opt
@@ -2774,6 +2821,8 @@ share/mysql/test/main/sp-vars.result
 share/mysql/test/main/sp-vars.test
 share/mysql/test/main/sp.result
 share/mysql/test/main/sp.test
+share/mysql/test/main/sp2.result
+share/mysql/test/main/sp2.test
 share/mysql/test/main/sp_gis.result
 share/mysql/test/main/sp_gis.test
 share/mysql/test/main/sp_missing_4665.result
@@ -3004,6 +3053,8 @@ share/mysql/test/main/temp_table.result
 share/mysql/test/main/temp_table.test
 share/mysql/test/main/temp_table_frm.result
 share/mysql/test/main/temp_table_frm.test
+share/mysql/test/main/temp_table_symlink.result
+share/mysql/test/main/temp_table_symlink.test
 share/mysql/test/main/temporal_literal.result
 share/mysql/test/main/temporal_literal.test
 share/mysql/test/main/temporal_scale_4283.result
@@ -3168,6 +3219,12 @@ share/mysql/test/main/update_use_source.test
 share/mysql/test/main/upgrade.opt
 share/mysql/test/main/upgrade.result
 share/mysql/test/main/upgrade.test
+share/mysql/test/main/upgrade_MDEV-19650.result
+share/mysql/test/main/upgrade_MDEV-19650.test
+share/mysql/test/main/upgrade_MDEV-23102-1.result
+share/mysql/test/main/upgrade_MDEV-23102-1.test
+share/mysql/test/main/upgrade_MDEV-23102-2.result
+share/mysql/test/main/upgrade_MDEV-23102-2.test
 share/mysql/test/main/user_limits-master.opt
 share/mysql/test/main/user_limits.result
 share/mysql/test/main/user_limits.test
@@ -3251,6 +3308,8 @@ share/mysql/test/main/win_sum.result
 share/mysql/test/main/win_sum.test
 share/mysql/test/main/windows.result
 share/mysql/test/main/windows.test
+share/mysql/test/main/windows_debug.result
+share/mysql/test/main/windows_debug.test
 share/mysql/test/main/wl4435_generated.inc
 share/mysql/test/main/xa.result
 share/mysql/test/main/xa.test
@@ -3278,6 +3337,11 @@ share/mysql/test/plugin/connect/connect/r/alter.result
 share/mysql/test/plugin/connect/connect/r/alter_xml.result
 share/mysql/test/plugin/connect/connect/r/alter_xml2.result
 share/mysql/test/plugin/connect/connect/r/bin.result
+share/mysql/test/plugin/connect/connect/r/bson.result
+share/mysql/test/plugin/connect/connect/r/bson_java_2.result
+share/mysql/test/plugin/connect/connect/r/bson_java_3.result
+share/mysql/test/plugin/connect/connect/r/bson_mongo_c.result
+share/mysql/test/plugin/connect/connect/r/bson_udf.result
 share/mysql/test/plugin/connect/connect/r/csv.result
 share/mysql/test/plugin/connect/connect/r/datest.result
 share/mysql/test/plugin/connect/connect/r/dbf.result
@@ -3329,6 +3393,7 @@ share/mysql/test/plugin/connect/connect/r/odbc_xls.result
 share/mysql/test/plugin/connect/connect/r/part_file.result
 share/mysql/test/plugin/connect/connect/r/part_table.result
 share/mysql/test/plugin/connect/connect/r/pivot.result
+share/mysql/test/plugin/connect/connect/r/rest.result
 share/mysql/test/plugin/connect/connect/r/secure_file_priv.result
 share/mysql/test/plugin/connect/connect/r/tbl.result
 share/mysql/test/plugin/connect/connect/r/tbl_thread.result
@@ -3397,6 +3462,13 @@ share/mysql/test/plugin/connect/connect/t/alter.test
 share/mysql/test/plugin/connect/connect/t/alter_xml.test
 share/mysql/test/plugin/connect/connect/t/alter_xml2.test
 share/mysql/test/plugin/connect/connect/t/bin.test
+share/mysql/test/plugin/connect/connect/t/bson.test
+share/mysql/test/plugin/connect/connect/t/bson_java_2.test
+share/mysql/test/plugin/connect/connect/t/bson_java_3.test
+share/mysql/test/plugin/connect/connect/t/bson_mongo_c.test
+share/mysql/test/plugin/connect/connect/t/bson_udf.inc
+share/mysql/test/plugin/connect/connect/t/bson_udf.test
+share/mysql/test/plugin/connect/connect/t/bson_udf2.inc
 share/mysql/test/plugin/connect/connect/t/csv.test
 share/mysql/test/plugin/connect/connect/t/datest.test
 share/mysql/test/plugin/connect/connect/t/dbf.test
@@ -3421,7 +3493,6 @@ share/mysql/test/plugin/connect/connect/t/index.test
 share/mysql/test/plugin/connect/connect/t/infoschema-9739.test
 share/mysql/test/plugin/connect/connect/t/infoschema2-9739.test
 share/mysql/test/plugin/connect/connect/t/ini.test
-share/mysql/test/plugin/connect/connect/t/ini_grant.result
 share/mysql/test/plugin/connect/connect/t/ini_grant.test
 share/mysql/test/plugin/connect/connect/t/jdbc.test
 share/mysql/test/plugin/connect/connect/t/jdbc_new.test
@@ -3467,6 +3538,8 @@ share/mysql/test/plugin/connect/connect/t/odbc_xls.test
 share/mysql/test/plugin/connect/connect/t/part_file.test
 share/mysql/test/plugin/connect/connect/t/part_table.test
 share/mysql/test/plugin/connect/connect/t/pivot.test
+share/mysql/test/plugin/connect/connect/t/rest.inc
+share/mysql/test/plugin/connect/connect/t/rest.test
 share/mysql/test/plugin/connect/connect/t/secure_file_priv-master.opt
 share/mysql/test/plugin/connect/connect/t/secure_file_priv.test
 share/mysql/test/plugin/connect/connect/t/tbl.test
@@ -5123,12 +5196,22 @@ share/mysql/test/plugin/spider/spider/bugfix/include/delete_with_float_column_ma
 share/mysql/test/plugin/spider/spider/bugfix/include/delete_with_float_column_mariadb_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/delete_with_float_column_mysql_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/delete_with_float_column_mysql_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/direct_sql_with_comma_pwd_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/direct_sql_with_comma_pwd_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/direct_sql_with_tmp_table_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/direct_sql_with_tmp_table_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/group_by_order_by_limit_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/group_by_order_by_limit_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/mdev_19866_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/mdev_19866_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_20100_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_20100_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_20502_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_20502_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_21884_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_21884_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_22246_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/mdev_22246_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/quick_mode_0_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/quick_mode_0_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/quick_mode_1_deinit.inc
@@ -5163,6 +5246,8 @@ share/mysql/test/plugin/spider/spider/bugfix/include/wait_timeout_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/wait_timeout_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/wrapper_mariadb_deinit.inc
 share/mysql/test/plugin/spider/spider/bugfix/include/wrapper_mariadb_init.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/xa_cmd_deinit.inc
+share/mysql/test/plugin/spider/spider/bugfix/include/xa_cmd_init.inc
 share/mysql/test/plugin/spider/spider/bugfix/my.cnf
 share/mysql/test/plugin/spider/spider/bugfix/my_1_1.cnf
 share/mysql/test/plugin/spider/spider/bugfix/my_2_1.cnf
@@ -5176,9 +5261,14 @@ share/mysql/test/plugin/spider/spider/bugfix/r/checksum_table_with_quick_mode_3.
 share/mysql/test/plugin/spider/spider/bugfix/r/cp932_column.result
 share/mysql/test/plugin/spider/spider/bugfix/r/delete_with_float_column_mariadb.result
 share/mysql/test/plugin/spider/spider/bugfix/r/delete_with_float_column_mysql.result
+share/mysql/test/plugin/spider/spider/bugfix/r/direct_sql_with_comma_pwd.result
 share/mysql/test/plugin/spider/spider/bugfix/r/direct_sql_with_tmp_table.result
 share/mysql/test/plugin/spider/spider/bugfix/r/group_by_order_by_limit.result
 share/mysql/test/plugin/spider/spider/bugfix/r/mdev_19866.result
+share/mysql/test/plugin/spider/spider/bugfix/r/mdev_20100.result
+share/mysql/test/plugin/spider/spider/bugfix/r/mdev_20502.result
+share/mysql/test/plugin/spider/spider/bugfix/r/mdev_21884.result
+share/mysql/test/plugin/spider/spider/bugfix/r/mdev_22246.result
 share/mysql/test/plugin/spider/spider/bugfix/r/quick_mode_0.result
 share/mysql/test/plugin/spider/spider/bugfix/r/quick_mode_1.result
 share/mysql/test/plugin/spider/spider/bugfix/r/quick_mode_2.result
@@ -5195,6 +5285,7 @@ share/mysql/test/plugin/spider/spider/bugfix/r/sql_mode_mariadb.result
 share/mysql/test/plugin/spider/spider/bugfix/r/sql_mode_mysql.result
 share/mysql/test/plugin/spider/spider/bugfix/r/wait_timeout.result
 share/mysql/test/plugin/spider/spider/bugfix/r/wrapper_mariadb.result
+share/mysql/test/plugin/spider/spider/bugfix/r/xa_cmd.result
 share/mysql/test/plugin/spider/spider/bugfix/suite.opt
 share/mysql/test/plugin/spider/spider/bugfix/suite.pm
 share/mysql/test/plugin/spider/spider/bugfix/t/checksum_table_with_quick_mode_3.cnf
@@ -5206,12 +5297,22 @@ share/mysql/test/plugin/spider/spider/bugfix/t/delete_with_float_column_mariadb.
 share/mysql/test/plugin/spider/spider/bugfix/t/delete_with_float_column_mariadb.test
 share/mysql/test/plugin/spider/spider/bugfix/t/delete_with_float_column_mysql.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/delete_with_float_column_mysql.test
+share/mysql/test/plugin/spider/spider/bugfix/t/direct_sql_with_comma_pwd.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/direct_sql_with_comma_pwd.test
 share/mysql/test/plugin/spider/spider/bugfix/t/direct_sql_with_tmp_table.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/direct_sql_with_tmp_table.test
 share/mysql/test/plugin/spider/spider/bugfix/t/group_by_order_by_limit.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/group_by_order_by_limit.test
 share/mysql/test/plugin/spider/spider/bugfix/t/mdev_19866.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/mdev_19866.test
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_20100.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_20100.test
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_20502.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_20502.test
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_21884.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_21884.test
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_22246.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/mdev_22246.test
 share/mysql/test/plugin/spider/spider/bugfix/t/quick_mode_0.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/quick_mode_0.test
 share/mysql/test/plugin/spider/spider/bugfix/t/quick_mode_1.cnf
@@ -5245,6 +5346,8 @@ share/mysql/test/plugin/spider/spider/bugfix/t/wait_timeout.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/wait_timeout.test
 share/mysql/test/plugin/spider/spider/bugfix/t/wrapper_mariadb.cnf
 share/mysql/test/plugin/spider/spider/bugfix/t/wrapper_mariadb.test
+share/mysql/test/plugin/spider/spider/bugfix/t/xa_cmd.cnf
+share/mysql/test/plugin/spider/spider/bugfix/t/xa_cmd.test
 share/mysql/test/plugin/spider/spider/feature/include/checksum_table_parallel_deinit.inc
 share/mysql/test/plugin/spider/spider/feature/include/checksum_table_parallel_extended_deinit.inc
 share/mysql/test/plugin/spider/spider/feature/include/checksum_table_parallel_extended_init.inc
@@ -6070,6 +6173,9 @@ share/mysql/test/std_data/mysql56timestamp.frm
 share/mysql/test/std_data/mysql57_virtual.MYD
 share/mysql/test/std_data/mysql57_virtual.MYI
 share/mysql/test/std_data/mysql57_virtual.frm
+share/mysql/test/std_data/mysql57user.MYD
+share/mysql/test/std_data/mysql57user.MYI
+share/mysql/test/std_data/mysql57user.frm
 share/mysql/test/std_data/mysql_upgrade/event.MYD
 share/mysql/test/std_data/mysql_upgrade/event.MYI
 share/mysql/test/std_data/mysql_upgrade/event.frm
@@ -6252,10 +6358,13 @@ share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_innodb.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_myisam.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
 share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_stop_never.result
+share/mysql/test/suite/binlog/r/binlog_mysqlbinlog_suppress_O_TMPFILE.result
+share/mysql/test/suite/binlog/r/binlog_no_uniqfile_crash.result
 share/mysql/test/suite/binlog/r/binlog_old_versions.result
 share/mysql/test/suite/binlog/r/binlog_parallel_replication_marks_row.result
 share/mysql/test/suite/binlog/r/binlog_parallel_replication_marks_stm_mix.result
 share/mysql/test/suite/binlog/r/binlog_query_filter_rules.result
+share/mysql/test/suite/binlog/r/binlog_recover_checksum_error.result
 share/mysql/test/suite/binlog/r/binlog_rotate_perf.result
 share/mysql/test/suite/binlog/r/binlog_row_annotate.result
 share/mysql/test/suite/binlog/r/binlog_row_binlog.result
@@ -6380,11 +6489,14 @@ share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_myisam.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans-master.opt
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
 share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test
+share/mysql/test/suite/binlog/t/binlog_mysqlbinlog_suppress_O_TMPFILE.test
+share/mysql/test/suite/binlog/t/binlog_no_uniqfile_crash.test
 share/mysql/test/suite/binlog/t/binlog_old_versions.test
 share/mysql/test/suite/binlog/t/binlog_parallel_replication_marks_row.test
 share/mysql/test/suite/binlog/t/binlog_parallel_replication_marks_stm_mix.test
 share/mysql/test/suite/binlog/t/binlog_query_filter_rules-master.opt
 share/mysql/test/suite/binlog/t/binlog_query_filter_rules.test
+share/mysql/test/suite/binlog/t/binlog_recover_checksum_error.test
 share/mysql/test/suite/binlog/t/binlog_rotate_perf.test
 share/mysql/test/suite/binlog/t/binlog_row_annotate-master.opt
 share/mysql/test/suite/binlog/t/binlog_row_annotate.test
@@ -6407,7 +6519,6 @@ share/mysql/test/suite/binlog/t/binlog_server_id.test
 share/mysql/test/suite/binlog/t/binlog_sf.test
 share/mysql/test/suite/binlog/t/binlog_show_binlog_event_random_pos.combinations
 share/mysql/test/suite/binlog/t/binlog_show_binlog_event_random_pos.test
-share/mysql/test/suite/binlog/t/binlog_spurious_ddl_errors-master.opt
 share/mysql/test/suite/binlog/t/binlog_spurious_ddl_errors.test
 share/mysql/test/suite/binlog/t/binlog_sql_mode.test
 share/mysql/test/suite/binlog/t/binlog_start_comment.test
@@ -6438,7 +6549,6 @@ share/mysql/test/suite/binlog/t/binlog_switch_inside_trans.test
 share/mysql/test/suite/binlog/t/binlog_tmp_table.test
 share/mysql/test/suite/binlog/t/binlog_tmp_table_row.test
 share/mysql/test/suite/binlog/t/binlog_trigger.test
-share/mysql/test/suite/binlog/t/binlog_truncate_innodb-master.opt
 share/mysql/test/suite/binlog/t/binlog_truncate_innodb.test
 share/mysql/test/suite/binlog/t/binlog_truncate_kill.test
 share/mysql/test/suite/binlog/t/binlog_truncate_myisam.test
@@ -6586,8 +6696,13 @@ share/mysql/test/suite/binlog_encryption/rpl_typeconv.result
 share/mysql/test/suite/binlog_encryption/rpl_typeconv.test
 share/mysql/test/suite/binlog_encryption/suite.pm
 share/mysql/test/suite/binlog_encryption/testdata.inc
+share/mysql/test/suite/compat/maxdb/rpl_mariadb_timestamp.result
+share/mysql/test/suite/compat/maxdb/rpl_mariadb_timestamp.test
+share/mysql/test/suite/compat/maxdb/type_timestamp.result
+share/mysql/test/suite/compat/maxdb/type_timestamp.test
 share/mysql/test/suite/compat/mssql/parser.result
 share/mysql/test/suite/compat/mssql/parser.test
+share/mysql/test/suite/compat/oracle/r/binlog_ptr_mysqlbinlog.result
 share/mysql/test/suite/compat/oracle/r/binlog_stm_ps.result
 share/mysql/test/suite/compat/oracle/r/binlog_stm_sp.result
 share/mysql/test/suite/compat/oracle/r/binlog_stm_sp_package.result
@@ -6614,6 +6729,7 @@ share/mysql/test/suite/compat/oracle/r/mysqldump_restore.result
 share/mysql/test/suite/compat/oracle/r/parser.result
 share/mysql/test/suite/compat/oracle/r/plugin.result
 share/mysql/test/suite/compat/oracle/r/ps.result
+share/mysql/test/suite/compat/oracle/r/rpl_mariadb_date.result
 share/mysql/test/suite/compat/oracle/r/rpl_sp_package.result
 share/mysql/test/suite/compat/oracle/r/rpl_sp_package_variables.result
 share/mysql/test/suite/compat/oracle/r/sequence.result
@@ -6656,6 +6772,8 @@ share/mysql/test/suite/compat/oracle/r/variables.result
 share/mysql/test/suite/compat/oracle/r/vcol.result
 share/mysql/test/suite/compat/oracle/r/versioning.result
 share/mysql/test/suite/compat/oracle/r/win.result
+share/mysql/test/suite/compat/oracle/t/binlog_ptr_mysqlbinlog-master.opt
+share/mysql/test/suite/compat/oracle/t/binlog_ptr_mysqlbinlog.test
 share/mysql/test/suite/compat/oracle/t/binlog_stm_ps.test
 share/mysql/test/suite/compat/oracle/t/binlog_stm_sp.test
 share/mysql/test/suite/compat/oracle/t/binlog_stm_sp_package.test
@@ -6682,6 +6800,7 @@ share/mysql/test/suite/compat/oracle/t/mysqldump_restore.test
 share/mysql/test/suite/compat/oracle/t/parser.test
 share/mysql/test/suite/compat/oracle/t/plugin.test
 share/mysql/test/suite/compat/oracle/t/ps.test
+share/mysql/test/suite/compat/oracle/t/rpl_mariadb_date.test
 share/mysql/test/suite/compat/oracle/t/rpl_sp_package.test
 share/mysql/test/suite/compat/oracle/t/rpl_sp_package_variables.test
 share/mysql/test/suite/compat/oracle/t/sequence.test
@@ -6749,6 +6868,7 @@ share/mysql/test/suite/encryption/r/aria_tiny.result
 share/mysql/test/suite/encryption/r/compressed_import_tablespace.result
 share/mysql/test/suite/encryption/r/corrupted_during_recovery.result
 share/mysql/test/suite/encryption/r/create_or_replace.result
+share/mysql/test/suite/encryption/r/create_or_replace_big.result
 share/mysql/test/suite/encryption/r/debug_key_management.result
 share/mysql/test/suite/encryption/r/encrypt_and_grep.result
 share/mysql/test/suite/encryption/r/encryption_force.result
@@ -6810,6 +6930,7 @@ share/mysql/test/suite/encryption/r/innodb_scrub.result
 share/mysql/test/suite/encryption/r/innodb_scrub_background.result
 share/mysql/test/suite/encryption/r/second_plugin-12863.result
 share/mysql/test/suite/encryption/r/tempfiles.result
+share/mysql/test/suite/encryption/r/tempfiles_encrypted.result
 share/mysql/test/suite/encryption/suite.pm
 share/mysql/test/suite/encryption/t/aria_tiny.test
 share/mysql/test/suite/encryption/t/compressed_import_tablespace.opt
@@ -6818,6 +6939,8 @@ share/mysql/test/suite/encryption/t/corrupted_during_recovery.combinations
 share/mysql/test/suite/encryption/t/corrupted_during_recovery.test
 share/mysql/test/suite/encryption/t/create_or_replace.opt
 share/mysql/test/suite/encryption/t/create_or_replace.test
+share/mysql/test/suite/encryption/t/create_or_replace_big.opt
+share/mysql/test/suite/encryption/t/create_or_replace_big.test
 share/mysql/test/suite/encryption/t/debug_key_management.opt
 share/mysql/test/suite/encryption/t/debug_key_management.test
 share/mysql/test/suite/encryption/t/encrypt_and_grep.opt
@@ -6936,6 +7059,8 @@ share/mysql/test/suite/encryption/t/second_plugin-12863.test
 share/mysql/test/suite/encryption/t/tempfiles.combinations
 share/mysql/test/suite/encryption/t/tempfiles.opt
 share/mysql/test/suite/encryption/t/tempfiles.test
+share/mysql/test/suite/encryption/t/tempfiles_encrypted.opt
+share/mysql/test/suite/encryption/t/tempfiles_encrypted.test
 share/mysql/test/suite/engines/README
 share/mysql/test/suite/engines/funcs/combinations
 share/mysql/test/suite/engines/funcs/disabled.def
@@ -8284,8 +8409,16 @@ share/mysql/test/suite/galera/r/MDEV-15443.result
 share/mysql/test/suite/galera/r/MDEV-16509.result
 share/mysql/test/suite/galera/r/MDEV-18832.result
 share/mysql/test/suite/galera/r/MDEV-20225.result
+share/mysql/test/suite/galera/r/MDEV-20616.result
 share/mysql/test/suite/galera/r/MDEV-20793.result
+share/mysql/test/suite/galera/r/MDEV-22021.result
+share/mysql/test/suite/galera/r/MDEV-22051.result
+share/mysql/test/suite/galera/r/MDEV-22055.result
+share/mysql/test/suite/galera/r/MDEV-22458.result
+share/mysql/test/suite/galera/r/MDEV-24063.result
+share/mysql/test/suite/galera/r/MDEV-24327.result
 share/mysql/test/suite/galera/r/MDEV-6860.result
+share/mysql/test/suite/galera/r/MENT-1047.result
 share/mysql/test/suite/galera/r/MW-252.result
 share/mysql/test/suite/galera/r/MW-258.result
 share/mysql/test/suite/galera/r/MW-259.result
@@ -8303,7 +8436,6 @@ share/mysql/test/suite/galera/r/MW-328E.result
 share/mysql/test/suite/galera/r/MW-329.result
 share/mysql/test/suite/galera/r/MW-336.result
 share/mysql/test/suite/galera/r/MW-357.result
-share/mysql/test/suite/galera/r/MW-360.result
 share/mysql/test/suite/galera/r/MW-369.result
 share/mysql/test/suite/galera/r/MW-388.result
 share/mysql/test/suite/galera/r/MW-402.result
@@ -8322,7 +8454,7 @@ share/mysql/test/suite/galera/r/galera#414.result
 share/mysql/test/suite/galera/r/galera#500.result
 share/mysql/test/suite/galera/r/galera#505.result
 share/mysql/test/suite/galera/r/galera_FK_duplicate_client_insert.result
-share/mysql/test/suite/galera/r/galera_account_management.result
+share/mysql/test/suite/galera/r/galera_UK_conflict.result
 share/mysql/test/suite/galera/r/galera_admin.result
 share/mysql/test/suite/galera/r/galera_alter_engine_innodb.result
 share/mysql/test/suite/galera/r/galera_alter_engine_myisam.result
@@ -8330,8 +8462,6 @@ share/mysql/test/suite/galera/r/galera_alter_table_force.result
 share/mysql/test/suite/galera/r/galera_applier_ftwrl_table.result
 share/mysql/test/suite/galera/r/galera_applier_ftwrl_table_alter.result
 share/mysql/test/suite/galera/r/galera_as_master.result
-share/mysql/test/suite/galera/r/galera_as_master_gtid.result
-share/mysql/test/suite/galera/r/galera_as_master_gtid_change_master.result
 share/mysql/test/suite/galera/r/galera_as_master_large.result
 share/mysql/test/suite/galera/r/galera_as_slave.result
 share/mysql/test/suite/galera/r/galera_as_slave_autoinc.result
@@ -8339,11 +8469,8 @@ share/mysql/test/suite/galera/r/galera_as_slave_ctas.result
 share/mysql/test/suite/galera/r/galera_as_slave_gtid.result
 share/mysql/test/suite/galera/r/galera_as_slave_gtid_auto_engine.result
 share/mysql/test/suite/galera/r/galera_as_slave_gtid_myisam.result
-share/mysql/test/suite/galera/r/galera_as_slave_gtid_replicate_do_db.result
-share/mysql/test/suite/galera/r/galera_as_slave_gtid_replicate_do_db_cc.result
 share/mysql/test/suite/galera/r/galera_as_slave_nonprim.result
-share/mysql/test/suite/galera/r/galera_as_slave_preordered.result
-share/mysql/test/suite/galera/r/galera_as_slave_replication_bundle.result
+share/mysql/test/suite/galera/r/galera_as_slave_replay.result
 share/mysql/test/suite/galera/r/galera_autoinc_sst_mariabackup.result
 share/mysql/test/suite/galera/r/galera_bf_abort.result
 share/mysql/test/suite/galera/r/galera_bf_abort_at_after_statement.result
@@ -8353,16 +8480,19 @@ share/mysql/test/suite/galera/r/galera_bf_abort_ftwrl.result
 share/mysql/test/suite/galera/r/galera_bf_abort_get_lock.result
 share/mysql/test/suite/galera/r/galera_bf_abort_group_commit.result
 share/mysql/test/suite/galera/r/galera_bf_abort_lock_table.result
+share/mysql/test/suite/galera/r/galera_bf_abort_ps.result
+share/mysql/test/suite/galera/r/galera_bf_abort_ps_threadpool.result
 share/mysql/test/suite/galera/r/galera_bf_abort_shutdown.result
 share/mysql/test/suite/galera/r/galera_bf_abort_sleep.result
 share/mysql/test/suite/galera/r/galera_bf_background_statistics.result
+share/mysql/test/suite/galera/r/galera_bf_kill.result
+share/mysql/test/suite/galera/r/galera_bf_kill_debug.result
 share/mysql/test/suite/galera/r/galera_bf_lock_wait.result
 share/mysql/test/suite/galera/r/galera_binlog_cache_size.result
 share/mysql/test/suite/galera/r/galera_binlog_checksum.result
 share/mysql/test/suite/galera/r/galera_binlog_event_max_size_max.result
 share/mysql/test/suite/galera/r/galera_binlog_event_max_size_min.result
 share/mysql/test/suite/galera/r/galera_binlog_row_image.result
-share/mysql/test/suite/galera/r/galera_binlog_rows_query_log_events.result
 share/mysql/test/suite/galera/r/galera_binlog_stmt_autoinc.result
 share/mysql/test/suite/galera/r/galera_change_user.result
 share/mysql/test/suite/galera/r/galera_commit_empty.result
@@ -8372,6 +8502,7 @@ share/mysql/test/suite/galera/r/galera_create_procedure.result
 share/mysql/test/suite/galera/r/galera_create_table_as_select.result
 share/mysql/test/suite/galera/r/galera_create_table_like.result
 share/mysql/test/suite/galera/r/galera_create_trigger.result
+share/mysql/test/suite/galera/r/galera_ddl_fk_conflict.result
 share/mysql/test/suite/galera/r/galera_ddl_multiline.result
 share/mysql/test/suite/galera/r/galera_defaults.result
 share/mysql/test/suite/galera/r/galera_delete_limit.result
@@ -8383,6 +8514,7 @@ share/mysql/test/suite/galera/r/galera_enum.result
 share/mysql/test/suite/galera/r/galera_events.result
 share/mysql/test/suite/galera/r/galera_events2.result
 share/mysql/test/suite/galera/r/galera_fk_cascade_delete.result
+share/mysql/test/suite/galera/r/galera_fk_cascade_delete_debug.result
 share/mysql/test/suite/galera/r/galera_fk_cascade_update.result
 share/mysql/test/suite/galera/r/galera_fk_conflict.result
 share/mysql/test/suite/galera/r/galera_fk_mismatch.result
@@ -8391,7 +8523,6 @@ share/mysql/test/suite/galera/r/galera_fk_multitable.result
 share/mysql/test/suite/galera/r/galera_fk_no_pk.result
 share/mysql/test/suite/galera/r/galera_fk_selfreferential.result
 share/mysql/test/suite/galera/r/galera_fk_setnull.result
-share/mysql/test/suite/galera/r/galera_flush.result
 share/mysql/test/suite/galera/r/galera_flush_local.result
 share/mysql/test/suite/galera/r/galera_forced_binlog_format.result
 share/mysql/test/suite/galera/r/galera_ftwrl.result
@@ -8428,6 +8559,7 @@ share/mysql/test/suite/galera/r/galera_kill_smallchanges.result
 share/mysql/test/suite/galera/r/galera_last_committed_id.result
 share/mysql/test/suite/galera/r/galera_load_data.result
 share/mysql/test/suite/galera/r/galera_lock_table.result
+share/mysql/test/suite/galera/r/galera_lock_tables_in_transaction.result
 share/mysql/test/suite/galera/r/galera_log_bin.result
 share/mysql/test/suite/galera/r/galera_log_output_csv.result
 share/mysql/test/suite/galera/r/galera_many_columns.result
@@ -8439,8 +8571,8 @@ share/mysql/test/suite/galera/r/galera_mdev_10812.result
 share/mysql/test/suite/galera/r/galera_mdev_13787.result
 share/mysql/test/suite/galera/r/galera_mdev_15611.result
 share/mysql/test/suite/galera/r/galera_mdl_race.result
-share/mysql/test/suite/galera/r/galera_migrate.result
 share/mysql/test/suite/galera/r/galera_multi_database.result
+share/mysql/test/suite/galera/r/galera_multirow_rollback.result
 share/mysql/test/suite/galera/r/galera_myisam_autocommit.result
 share/mysql/test/suite/galera/r/galera_myisam_transactions.result
 share/mysql/test/suite/galera/r/galera_nopk_bit.result
@@ -8479,6 +8611,7 @@ share/mysql/test/suite/galera/r/galera_server.result
 share/mysql/test/suite/galera/r/galera_set_position_after_cert_failure.result
 share/mysql/test/suite/galera/r/galera_set_position_after_dummy_writeset.result
 share/mysql/test/suite/galera/r/galera_shutdown_nonprim.result
+share/mysql/test/suite/galera/r/galera_slave_replay.result
 share/mysql/test/suite/galera/r/galera_sp_bf_abort.result
 share/mysql/test/suite/galera/r/galera_sp_insert_parallel.result
 share/mysql/test/suite/galera/r/galera_split_brain.result
@@ -8491,6 +8624,7 @@ share/mysql/test/suite/galera/r/galera_sst_mariabackup.result
 share/mysql/test/suite/galera/r/galera_sst_mariabackup_data_dir,debug.rdiff
 share/mysql/test/suite/galera/r/galera_sst_mariabackup_data_dir.result
 share/mysql/test/suite/galera/r/galera_sst_mariabackup_encrypt_with_key.result
+share/mysql/test/suite/galera/r/galera_sst_mariabackup_lost_found.result
 share/mysql/test/suite/galera/r/galera_sst_mariabackup_table_options.result
 share/mysql/test/suite/galera/r/galera_sst_mysqldump,debug.rdiff
 share/mysql/test/suite/galera/r/galera_sst_mysqldump,release.rdiff
@@ -8523,6 +8657,7 @@ share/mysql/test/suite/galera/r/galera_toi_lock_shared.result
 share/mysql/test/suite/galera/r/galera_toi_truncate.result
 share/mysql/test/suite/galera/r/galera_transaction_read_only.result
 share/mysql/test/suite/galera/r/galera_transaction_replay.result
+share/mysql/test/suite/galera/r/galera_trigger.result
 share/mysql/test/suite/galera/r/galera_truncate.result
 share/mysql/test/suite/galera/r/galera_truncate_temporary.result
 share/mysql/test/suite/galera/r/galera_unicode_identifiers.result
@@ -8535,6 +8670,7 @@ share/mysql/test/suite/galera/r/galera_var_auto_inc_control_off.result
 share/mysql/test/suite/galera/r/galera_var_auto_inc_control_on.result
 share/mysql/test/suite/galera/r/galera_var_certify_nonPK_off.result
 share/mysql/test/suite/galera/r/galera_var_cluster_address.result
+share/mysql/test/suite/galera/r/galera_var_cluster_conf_id.result
 share/mysql/test/suite/galera/r/galera_var_desync_on.result
 share/mysql/test/suite/galera/r/galera_var_dirty_reads.result
 share/mysql/test/suite/galera/r/galera_var_fkchecks.result
@@ -8555,7 +8691,10 @@ share/mysql/test/suite/galera/r/galera_var_retry_autocommit.result
 share/mysql/test/suite/galera/r/galera_var_slave_threads.result
 share/mysql/test/suite/galera/r/galera_var_sst_auth.result
 share/mysql/test/suite/galera/r/galera_var_sync_wait.result
+share/mysql/test/suite/galera/r/galera_var_trx_fragment_size.result
 share/mysql/test/suite/galera/r/galera_var_wsrep_on_off.result
+share/mysql/test/suite/galera/r/galera_var_wsrep_start_position.result
+share/mysql/test/suite/galera/r/galera_virtual_column.result
 share/mysql/test/suite/galera/r/galera_wan.result
 share/mysql/test/suite/galera/r/galera_wan_restart_ist.result
 share/mysql/test/suite/galera/r/galera_wan_restart_sst.result
@@ -8575,8 +8714,11 @@ share/mysql/test/suite/galera/r/lp1376747-4.result
 share/mysql/test/suite/galera/r/lp1376747.result
 share/mysql/test/suite/galera/r/lp1438990.result
 share/mysql/test/suite/galera/r/lp959512.result
+share/mysql/test/suite/galera/r/mdev-22543.result
 share/mysql/test/suite/galera/r/mdev_10518.result
 share/mysql/test/suite/galera/r/mdev_18730.result
+share/mysql/test/suite/galera/r/mdev_21025.result
+share/mysql/test/suite/galera/r/mdev_21718.result
 share/mysql/test/suite/galera/r/mdev_9290.result
 share/mysql/test/suite/galera/r/mysql-wsrep#110.result
 share/mysql/test/suite/galera/r/mysql-wsrep#198.result
@@ -8584,9 +8726,11 @@ share/mysql/test/suite/galera/r/mysql-wsrep#201.result
 share/mysql/test/suite/galera/r/mysql-wsrep#237.result
 share/mysql/test/suite/galera/r/mysql-wsrep#247.result
 share/mysql/test/suite/galera/r/mysql-wsrep#31.result
+share/mysql/test/suite/galera/r/mysql-wsrep#33,debug.rdiff
 share/mysql/test/suite/galera/r/mysql-wsrep#33.result
 share/mysql/test/suite/galera/r/mysql-wsrep#332.result
 share/mysql/test/suite/galera/r/mysql-wsrep#90.result
+share/mysql/test/suite/galera/r/mysql-wsrep-bugs-607.result
 share/mysql/test/suite/galera/r/partition.result
 share/mysql/test/suite/galera/r/pxc-421.result
 share/mysql/test/suite/galera/r/query_cache.result
@@ -8610,9 +8754,19 @@ share/mysql/test/suite/galera/t/MDEV-16509.test
 share/mysql/test/suite/galera/t/MDEV-18832.cnf
 share/mysql/test/suite/galera/t/MDEV-18832.test
 share/mysql/test/suite/galera/t/MDEV-20225.test
+share/mysql/test/suite/galera/t/MDEV-20616.test
 share/mysql/test/suite/galera/t/MDEV-20793.test
+share/mysql/test/suite/galera/t/MDEV-22021.combinations
+share/mysql/test/suite/galera/t/MDEV-22021.test
+share/mysql/test/suite/galera/t/MDEV-22051.test
+share/mysql/test/suite/galera/t/MDEV-22055.test
+share/mysql/test/suite/galera/t/MDEV-22458.test
+share/mysql/test/suite/galera/t/MDEV-24063.test
+share/mysql/test/suite/galera/t/MDEV-24327.cnf
+share/mysql/test/suite/galera/t/MDEV-24327.test
 share/mysql/test/suite/galera/t/MDEV-6860.cnf
 share/mysql/test/suite/galera/t/MDEV-6860.test
+share/mysql/test/suite/galera/t/MENT-1047.test
 share/mysql/test/suite/galera/t/MW-252.test
 share/mysql/test/suite/galera/t/MW-258.test
 share/mysql/test/suite/galera/t/MW-259.test
@@ -8626,9 +8780,15 @@ share/mysql/test/suite/galera/t/MW-313.cnf
 share/mysql/test/suite/galera/t/MW-313.test
 share/mysql/test/suite/galera/t/MW-328-footer.inc
 share/mysql/test/suite/galera/t/MW-328-header.inc
+share/mysql/test/suite/galera/t/MW-328A.cnf
 share/mysql/test/suite/galera/t/MW-328A.test
+share/mysql/test/suite/galera/t/MW-328B.cnf
 share/mysql/test/suite/galera/t/MW-328B.test
+share/mysql/test/suite/galera/t/MW-328C.cnf
+share/mysql/test/suite/galera/t/MW-328C.test
+share/mysql/test/suite/galera/t/MW-328D.cnf
 share/mysql/test/suite/galera/t/MW-328D.test
+share/mysql/test/suite/galera/t/MW-328E.cnf
 share/mysql/test/suite/galera/t/MW-328E.test
 share/mysql/test/suite/galera/t/MW-329.cnf
 share/mysql/test/suite/galera/t/MW-329.test
@@ -8636,7 +8796,6 @@ share/mysql/test/suite/galera/t/MW-336.cnf
 share/mysql/test/suite/galera/t/MW-336.test
 share/mysql/test/suite/galera/t/MW-357.test
 share/mysql/test/suite/galera/t/MW-360-master.opt
-share/mysql/test/suite/galera/t/MW-360.test
 share/mysql/test/suite/galera/t/MW-369.inc
 share/mysql/test/suite/galera/t/MW-369.test
 share/mysql/test/suite/galera/t/MW-388.test
@@ -8660,7 +8819,7 @@ share/mysql/test/suite/galera/t/galera#414.test
 share/mysql/test/suite/galera/t/galera#500.test
 share/mysql/test/suite/galera/t/galera#505.test
 share/mysql/test/suite/galera/t/galera_FK_duplicate_client_insert.test
-share/mysql/test/suite/galera/t/galera_account_management.test
+share/mysql/test/suite/galera/t/galera_UK_conflict.test
 share/mysql/test/suite/galera/t/galera_admin.test
 share/mysql/test/suite/galera/t/galera_alter_engine_innodb.test
 share/mysql/test/suite/galera/t/galera_alter_engine_myisam.test
@@ -8671,10 +8830,6 @@ share/mysql/test/suite/galera/t/galera_applier_ftwrl_table_alter.cnf
 share/mysql/test/suite/galera/t/galera_applier_ftwrl_table_alter.test
 share/mysql/test/suite/galera/t/galera_as_master.cnf
 share/mysql/test/suite/galera/t/galera_as_master.test
-share/mysql/test/suite/galera/t/galera_as_master_gtid.cnf
-share/mysql/test/suite/galera/t/galera_as_master_gtid.test
-share/mysql/test/suite/galera/t/galera_as_master_gtid_change_master.cnf
-share/mysql/test/suite/galera/t/galera_as_master_gtid_change_master.test
 share/mysql/test/suite/galera/t/galera_as_master_large.cnf
 share/mysql/test/suite/galera/t/galera_as_master_large.test
 share/mysql/test/suite/galera/t/galera_as_slave.cnf
@@ -8690,15 +8845,10 @@ share/mysql/test/suite/galera/t/galera_as_slave_gtid_auto_engine.cnf
 share/mysql/test/suite/galera/t/galera_as_slave_gtid_auto_engine.test
 share/mysql/test/suite/galera/t/galera_as_slave_gtid_myisam.cnf
 share/mysql/test/suite/galera/t/galera_as_slave_gtid_myisam.test
-share/mysql/test/suite/galera/t/galera_as_slave_gtid_replicate_do_db.cnf
-share/mysql/test/suite/galera/t/galera_as_slave_gtid_replicate_do_db.test
-share/mysql/test/suite/galera/t/galera_as_slave_gtid_replicate_do_db_cc.test
 share/mysql/test/suite/galera/t/galera_as_slave_nonprim.cnf
 share/mysql/test/suite/galera/t/galera_as_slave_nonprim.test
-share/mysql/test/suite/galera/t/galera_as_slave_preordered.cnf
-share/mysql/test/suite/galera/t/galera_as_slave_preordered.test
-share/mysql/test/suite/galera/t/galera_as_slave_replication_bundle.cnf
-share/mysql/test/suite/galera/t/galera_as_slave_replication_bundle.test
+share/mysql/test/suite/galera/t/galera_as_slave_replay.cnf
+share/mysql/test/suite/galera/t/galera_as_slave_replay.test
 share/mysql/test/suite/galera/t/galera_autoinc_sst_mariabackup.cnf
 share/mysql/test/suite/galera/t/galera_autoinc_sst_mariabackup.test
 share/mysql/test/suite/galera/t/galera_bf_abort.test
@@ -8710,10 +8860,19 @@ share/mysql/test/suite/galera/t/galera_bf_abort_get_lock.test
 share/mysql/test/suite/galera/t/galera_bf_abort_group_commit.cnf
 share/mysql/test/suite/galera/t/galera_bf_abort_group_commit.test
 share/mysql/test/suite/galera/t/galera_bf_abort_lock_table.test
+share/mysql/test/suite/galera/t/galera_bf_abort_ps.cnf
+share/mysql/test/suite/galera/t/galera_bf_abort_ps.test
+share/mysql/test/suite/galera/t/galera_bf_abort_ps_threadpool.cnf
+share/mysql/test/suite/galera/t/galera_bf_abort_ps_threadpool.test
 share/mysql/test/suite/galera/t/galera_bf_abort_shutdown.test
 share/mysql/test/suite/galera/t/galera_bf_abort_sleep.test
 share/mysql/test/suite/galera/t/galera_bf_background_statistics.cnf
 share/mysql/test/suite/galera/t/galera_bf_background_statistics.test
+share/mysql/test/suite/galera/t/galera_bf_kill.cnf
+share/mysql/test/suite/galera/t/galera_bf_kill.test
+share/mysql/test/suite/galera/t/galera_bf_kill_debug.cnf
+share/mysql/test/suite/galera/t/galera_bf_kill_debug.test
+share/mysql/test/suite/galera/t/galera_bf_lock_wait.cnf
 share/mysql/test/suite/galera/t/galera_bf_lock_wait.test
 share/mysql/test/suite/galera/t/galera_binlog_cache_size.test
 share/mysql/test/suite/galera/t/galera_binlog_checksum.cnf
@@ -8723,7 +8882,6 @@ share/mysql/test/suite/galera/t/galera_binlog_event_max_size_max.test
 share/mysql/test/suite/galera/t/galera_binlog_event_max_size_min.cnf
 share/mysql/test/suite/galera/t/galera_binlog_event_max_size_min.test
 share/mysql/test/suite/galera/t/galera_binlog_row_image.test
-share/mysql/test/suite/galera/t/galera_binlog_rows_query_log_events.test
 share/mysql/test/suite/galera/t/galera_binlog_stmt_autoinc.test
 share/mysql/test/suite/galera/t/galera_change_user.test
 share/mysql/test/suite/galera/t/galera_commit_empty.test
@@ -8733,7 +8891,11 @@ share/mysql/test/suite/galera/t/galera_create_procedure.test
 share/mysql/test/suite/galera/t/galera_create_table_as_select.test
 share/mysql/test/suite/galera/t/galera_create_table_like.test
 share/mysql/test/suite/galera/t/galera_create_trigger.test
+share/mysql/test/suite/galera/t/galera_ddl_fk_conflict.inc
+share/mysql/test/suite/galera/t/galera_ddl_fk_conflict.test
+share/mysql/test/suite/galera/t/galera_ddl_fk_conflict_with_tmp.inc
 share/mysql/test/suite/galera/t/galera_ddl_multiline.test
+share/mysql/test/suite/galera/t/galera_defaults.cnf
 share/mysql/test/suite/galera/t/galera_defaults.test
 share/mysql/test/suite/galera/t/galera_delete_limit.test
 share/mysql/test/suite/galera/t/galera_desync_overlapped.test
@@ -8745,6 +8907,7 @@ share/mysql/test/suite/galera/t/galera_enum.test
 share/mysql/test/suite/galera/t/galera_events.test
 share/mysql/test/suite/galera/t/galera_events2.test
 share/mysql/test/suite/galera/t/galera_fk_cascade_delete.test
+share/mysql/test/suite/galera/t/galera_fk_cascade_delete_debug.test
 share/mysql/test/suite/galera/t/galera_fk_cascade_update.test
 share/mysql/test/suite/galera/t/galera_fk_conflict.test
 share/mysql/test/suite/galera/t/galera_fk_mismatch.test
@@ -8753,9 +8916,6 @@ share/mysql/test/suite/galera/t/galera_fk_multitable.test
 share/mysql/test/suite/galera/t/galera_fk_no_pk.test
 share/mysql/test/suite/galera/t/galera_fk_selfreferential.test
 share/mysql/test/suite/galera/t/galera_fk_setnull.test
-share/mysql/test/suite/galera/t/galera_flush.cnf
-share/mysql/test/suite/galera/t/galera_flush.test
-share/mysql/test/suite/galera/t/galera_flush_local.cnf
 share/mysql/test/suite/galera/t/galera_flush_local.test
 share/mysql/test/suite/galera/t/galera_forced_binlog_format-master.opt
 share/mysql/test/suite/galera/t/galera_forced_binlog_format.test
@@ -8806,6 +8966,7 @@ share/mysql/test/suite/galera/t/galera_last_committed_id.test
 share/mysql/test/suite/galera/t/galera_load_data.cnf
 share/mysql/test/suite/galera/t/galera_load_data.test
 share/mysql/test/suite/galera/t/galera_lock_table.test
+share/mysql/test/suite/galera/t/galera_lock_tables_in_transaction.test
 share/mysql/test/suite/galera/t/galera_log_bin.cnf
 share/mysql/test/suite/galera/t/galera_log_bin.test
 share/mysql/test/suite/galera/t/galera_log_output_csv-master.opt
@@ -8822,9 +8983,9 @@ share/mysql/test/suite/galera/t/galera_mdev_13787.test
 share/mysql/test/suite/galera/t/galera_mdev_15611.cnf
 share/mysql/test/suite/galera/t/galera_mdev_15611.test
 share/mysql/test/suite/galera/t/galera_mdl_race.test
-share/mysql/test/suite/galera/t/galera_migrate.cnf
-share/mysql/test/suite/galera/t/galera_migrate.test
 share/mysql/test/suite/galera/t/galera_multi_database.test
+share/mysql/test/suite/galera/t/galera_multirow_rollback.combinations
+share/mysql/test/suite/galera/t/galera_multirow_rollback.test
 share/mysql/test/suite/galera/t/galera_myisam_autocommit.test
 share/mysql/test/suite/galera/t/galera_myisam_transactions.test
 share/mysql/test/suite/galera/t/galera_nopk_bit.test
@@ -8867,6 +9028,8 @@ share/mysql/test/suite/galera/t/galera_server.test
 share/mysql/test/suite/galera/t/galera_set_position_after_cert_failure.test
 share/mysql/test/suite/galera/t/galera_set_position_after_dummy_writeset.test
 share/mysql/test/suite/galera/t/galera_shutdown_nonprim.test
+share/mysql/test/suite/galera/t/galera_slave_replay.cnf
+share/mysql/test/suite/galera/t/galera_slave_replay.test
 share/mysql/test/suite/galera/t/galera_sp_bf_abort.inc
 share/mysql/test/suite/galera/t/galera_sp_bf_abort.test
 share/mysql/test/suite/galera/t/galera_sp_insert_parallel.test
@@ -8884,6 +9047,8 @@ share/mysql/test/suite/galera/t/galera_sst_mariabackup_data_dir.cnf
 share/mysql/test/suite/galera/t/galera_sst_mariabackup_data_dir.test
 share/mysql/test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.cnf
 share/mysql/test/suite/galera/t/galera_sst_mariabackup_encrypt_with_key.test
+share/mysql/test/suite/galera/t/galera_sst_mariabackup_lost_found.cnf
+share/mysql/test/suite/galera/t/galera_sst_mariabackup_lost_found.test
 share/mysql/test/suite/galera/t/galera_sst_mariabackup_table_options.cnf
 share/mysql/test/suite/galera/t/galera_sst_mariabackup_table_options.test
 share/mysql/test/suite/galera/t/galera_sst_mysqldump.cnf
@@ -8917,6 +9082,7 @@ share/mysql/test/suite/galera/t/galera_toi_lock_shared.test
 share/mysql/test/suite/galera/t/galera_toi_truncate.test
 share/mysql/test/suite/galera/t/galera_transaction_read_only.test
 share/mysql/test/suite/galera/t/galera_transaction_replay.test
+share/mysql/test/suite/galera/t/galera_trigger.test
 share/mysql/test/suite/galera/t/galera_truncate.test
 share/mysql/test/suite/galera/t/galera_truncate_temporary.test
 share/mysql/test/suite/galera/t/galera_udf.cnf
@@ -8932,6 +9098,7 @@ share/mysql/test/suite/galera/t/galera_var_auto_inc_control_on.cnf
 share/mysql/test/suite/galera/t/galera_var_auto_inc_control_on.test
 share/mysql/test/suite/galera/t/galera_var_certify_nonPK_off.test
 share/mysql/test/suite/galera/t/galera_var_cluster_address.test
+share/mysql/test/suite/galera/t/galera_var_cluster_conf_id.test
 share/mysql/test/suite/galera/t/galera_var_desync_on.test
 share/mysql/test/suite/galera/t/galera_var_dirty_reads.test
 share/mysql/test/suite/galera/t/galera_var_fkchecks.test
@@ -8947,7 +9114,7 @@ share/mysql/test/suite/galera/t/galera_var_max_ws_size.test
 share/mysql/test/suite/galera/t/galera_var_mysql_replication_bundle.test
 share/mysql/test/suite/galera/t/galera_var_node_address.cnf
 share/mysql/test/suite/galera/t/galera_var_node_address.test
-share/mysql/test/suite/galera/t/galera_var_notify_cmd.cnf
+share/mysql/test/suite/galera/t/galera_var_notify_cmd-master.opt
 share/mysql/test/suite/galera/t/galera_var_notify_cmd.test
 share/mysql/test/suite/galera/t/galera_var_reject_queries.test
 share/mysql/test/suite/galera/t/galera_var_replicate_myisam_off.test
@@ -8958,7 +9125,10 @@ share/mysql/test/suite/galera/t/galera_var_slave_threads.test
 share/mysql/test/suite/galera/t/galera_var_sst_auth.cnf
 share/mysql/test/suite/galera/t/galera_var_sst_auth.test
 share/mysql/test/suite/galera/t/galera_var_sync_wait.test
+share/mysql/test/suite/galera/t/galera_var_trx_fragment_size.test
 share/mysql/test/suite/galera/t/galera_var_wsrep_on_off.test
+share/mysql/test/suite/galera/t/galera_var_wsrep_start_position.test
+share/mysql/test/suite/galera/t/galera_virtual_column.test
 share/mysql/test/suite/galera/t/galera_vote_drop_temporary-master.opt
 share/mysql/test/suite/galera/t/galera_wan.cnf
 share/mysql/test/suite/galera/t/galera_wan.test
@@ -8969,7 +9139,7 @@ share/mysql/test/suite/galera/t/galera_wan_restart_sst.test
 share/mysql/test/suite/galera/t/galera_wsrep_desync_wsrep_on.test
 share/mysql/test/suite/galera/t/galera_wsrep_log_conficts.cnf
 share/mysql/test/suite/galera/t/galera_wsrep_log_conficts.test
-share/mysql/test/suite/galera/t/galera_wsrep_new_cluster.cnf
+share/mysql/test/suite/galera/t/galera_wsrep_new_cluster-master.opt
 share/mysql/test/suite/galera/t/galera_wsrep_new_cluster.test
 share/mysql/test/suite/galera/t/galera_wsrep_provider_options_syntax.test
 share/mysql/test/suite/galera/t/galera_wsrep_provider_unset_set.test
@@ -8983,12 +9153,16 @@ share/mysql/test/suite/galera/t/lp1376747-4.test
 share/mysql/test/suite/galera/t/lp1376747.test
 share/mysql/test/suite/galera/t/lp1438990.test
 share/mysql/test/suite/galera/t/lp959512.test
+share/mysql/test/suite/galera/t/mdev-22543.test
 share/mysql/test/suite/galera/t/mdev_10518.cnf
 share/mysql/test/suite/galera/t/mdev_10518.test
 share/mysql/test/suite/galera/t/mdev_18730.test
+share/mysql/test/suite/galera/t/mdev_21025.test
+share/mysql/test/suite/galera/t/mdev_21718.cnf
+share/mysql/test/suite/galera/t/mdev_21718.test
 share/mysql/test/suite/galera/t/mdev_9290.test
 share/mysql/test/suite/galera/t/mysql-wsrep#110.test
-share/mysql/test/suite/galera/t/mysql-wsrep#198-master.opt
+share/mysql/test/suite/galera/t/mysql-wsrep#198.cnf
 share/mysql/test/suite/galera/t/mysql-wsrep#198.test
 share/mysql/test/suite/galera/t/mysql-wsrep#201.cnf
 share/mysql/test/suite/galera/t/mysql-wsrep#201.test
@@ -8999,6 +9173,7 @@ share/mysql/test/suite/galera/t/mysql-wsrep#33.cnf
 share/mysql/test/suite/galera/t/mysql-wsrep#33.test
 share/mysql/test/suite/galera/t/mysql-wsrep#332.test
 share/mysql/test/suite/galera/t/mysql-wsrep#90.test
+share/mysql/test/suite/galera/t/mysql-wsrep-bugs-607.test
 share/mysql/test/suite/galera/t/partition.test
 share/mysql/test/suite/galera/t/pxc-421.test
 share/mysql/test/suite/galera/t/query_cache.cnf
@@ -9015,6 +9190,8 @@ share/mysql/test/suite/galera/t/wsrep_trx_fragment_size_sr.test
 share/mysql/test/suite/galera_3nodes/disabled.def
 share/mysql/test/suite/galera_3nodes/galera_2x3nodes.cnf
 share/mysql/test/suite/galera_3nodes/galera_3nodes.cnf
+share/mysql/test/suite/galera_3nodes/include/galera_resume.inc
+share/mysql/test/suite/galera_3nodes/include/have_garbd.inc
 share/mysql/test/suite/galera_3nodes/my.cnf
 share/mysql/test/suite/galera_3nodes/r/GAL-501.result
 share/mysql/test/suite/galera_3nodes/r/galera_certification_ccc.result
@@ -9022,13 +9199,15 @@ share/mysql/test/suite/galera_3nodes/r/galera_certification_double_failure.resul
 share/mysql/test/suite/galera_3nodes/r/galera_evs_suspect_timeout.result
 share/mysql/test/suite/galera_3nodes/r/galera_garbd.result
 share/mysql/test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
-share/mysql/test/suite/galera_3nodes/r/galera_innobackupex_backup.result
 share/mysql/test/suite/galera_3nodes/r/galera_ipv6_mariabackup.result
 share/mysql/test/suite/galera_3nodes/r/galera_ipv6_mariabackup_section.result
 share/mysql/test/suite/galera_3nodes/r/galera_ipv6_mysqldump.result
 share/mysql/test/suite/galera_3nodes/r/galera_ipv6_rsync.result
 share/mysql/test/suite/galera_3nodes/r/galera_ipv6_rsync_section.result
 share/mysql/test/suite/galera_3nodes/r/galera_ist_gcache_rollover.result
+share/mysql/test/suite/galera_3nodes/r/galera_join_with_cc_A.result
+share/mysql/test/suite/galera_3nodes/r/galera_join_with_cc_B.result
+share/mysql/test/suite/galera_3nodes/r/galera_join_with_cc_C.result
 share/mysql/test/suite/galera_3nodes/r/galera_parallel_apply_3nodes.result
 share/mysql/test/suite/galera_3nodes/r/galera_pc_bootstrap.result
 share/mysql/test/suite/galera_3nodes/r/galera_pc_weight.result
@@ -9039,7 +9218,6 @@ share/mysql/test/suite/galera_3nodes/r/galera_var_dirty_reads2.result
 share/mysql/test/suite/galera_3nodes/r/galera_wsrep_schema.result
 share/mysql/test/suite/galera_3nodes/suite.pm
 share/mysql/test/suite/galera_3nodes/t/GAL-501.cnf
-share/mysql/test/suite/galera_3nodes/t/GAL-501.opt
 share/mysql/test/suite/galera_3nodes/t/GAL-501.test
 share/mysql/test/suite/galera_3nodes/t/galera_certification_ccc.test
 share/mysql/test/suite/galera_3nodes/t/galera_certification_double_failure.test
@@ -9047,30 +9225,27 @@ share/mysql/test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
 share/mysql/test/suite/galera_3nodes/t/galera_garbd.test
 share/mysql/test/suite/galera_3nodes/t/galera_gtid_2_cluster.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_gtid_2_cluster.test
-share/mysql/test/suite/galera_3nodes/t/galera_innobackupex_backup.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_innobackupex_backup.test
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup.opt
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.opt
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.test
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mysqldump.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mysqldump.opt
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync.opt
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync.test
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync_section.cnf
-share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync_section.opt
 share/mysql/test/suite/galera_3nodes/t/galera_ipv6_rsync_section.test
 share/mysql/test/suite/galera_3nodes/t/galera_ist_gcache_rollover.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_ist_gcache_rollover.test
+share/mysql/test/suite/galera_3nodes/t/galera_join_with_cc_A.test
+share/mysql/test/suite/galera_3nodes/t/galera_join_with_cc_B.test
+share/mysql/test/suite/galera_3nodes/t/galera_join_with_cc_C.test
 share/mysql/test/suite/galera_3nodes/t/galera_parallel_apply_3nodes.test
 share/mysql/test/suite/galera_3nodes/t/galera_pc_bootstrap.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_pc_bootstrap.test
 share/mysql/test/suite/galera_3nodes/t/galera_pc_weight.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_pc_weight.test
+share/mysql/test/suite/galera_3nodes/t/galera_safe_to_bootstrap.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test
 share/mysql/test/suite/galera_3nodes/t/galera_slave_options_do.cnf
 share/mysql/test/suite/galera_3nodes/t/galera_slave_options_do.test
@@ -9099,6 +9274,7 @@ share/mysql/test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollb
 share/mysql/test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result
 share/mysql/test/suite/galera_3nodes_sr/r/galera_sr_threeway_split.result
 share/mysql/test/suite/galera_3nodes_sr/r/galera_sr_threeway_split_no_primary.result
+share/mysql/test/suite/galera_3nodes_sr/suite.pm
 share/mysql/test/suite/galera_3nodes_sr/t/GCF-336.test
 share/mysql/test/suite/galera_3nodes_sr/t/GCF-582.test
 share/mysql/test/suite/galera_3nodes_sr/t/GCF-606.test
@@ -9124,11 +9300,8 @@ share/mysql/test/suite/galera_sr/my.cnf
 share/mysql/test/suite/galera_sr/r/GCF-1008.result
 share/mysql/test/suite/galera_sr/r/GCF-1018.result
 share/mysql/test/suite/galera_sr/r/GCF-1018B.result
-share/mysql/test/suite/galera_sr/r/GCF-1043A.result
-share/mysql/test/suite/galera_sr/r/GCF-1043B.result
 share/mysql/test/suite/galera_sr/r/GCF-1051.result
 share/mysql/test/suite/galera_sr/r/GCF-1060.result
-share/mysql/test/suite/galera_sr/r/GCF-437.result
 share/mysql/test/suite/galera_sr/r/GCF-561.result
 share/mysql/test/suite/galera_sr/r/GCF-571.result
 share/mysql/test/suite/galera_sr/r/GCF-572.result
@@ -9144,6 +9317,8 @@ share/mysql/test/suite/galera_sr/r/GCF-867.result
 share/mysql/test/suite/galera_sr/r/GCF-889.result
 share/mysql/test/suite/galera_sr/r/GCF-900.result
 share/mysql/test/suite/galera_sr/r/MDEV-18585.result
+share/mysql/test/suite/galera_sr/r/MDEV-22616.result
+share/mysql/test/suite/galera_sr/r/MDEV-23623.result
 share/mysql/test/suite/galera_sr/r/galera-features#56.result
 share/mysql/test/suite/galera_sr/r/galera_sr_bf_abort.result
 share/mysql/test/suite/galera_sr/r/galera_sr_blob.result
@@ -9175,6 +9350,7 @@ share/mysql/test/suite/galera_sr/r/galera_sr_load_data.result
 share/mysql/test/suite/galera_sr/r/galera_sr_load_data_splitting.result
 share/mysql/test/suite/galera_sr/r/galera_sr_log_bin.result
 share/mysql/test/suite/galera_sr/r/galera_sr_many_fragments.result
+share/mysql/test/suite/galera_sr/r/galera_sr_multirow_rollback.result
 share/mysql/test/suite/galera_sr/r/galera_sr_myisam.result
 share/mysql/test/suite/galera_sr/r/galera_sr_mysqldump_sst.result
 share/mysql/test/suite/galera_sr/r/galera_sr_parallel_apply.result
@@ -9185,7 +9361,6 @@ share/mysql/test/suite/galera_sr/r/galera_sr_rollback_statement.result
 share/mysql/test/suite/galera_sr/r/galera_sr_shutdown_master.result
 share/mysql/test/suite/galera_sr/r/galera_sr_shutdown_slave.result
 share/mysql/test/suite/galera_sr/r/galera_sr_small_gcache.result
-share/mysql/test/suite/galera_sr/r/galera_sr_table_contents.result
 share/mysql/test/suite/galera_sr/r/galera_sr_transaction_replay.result
 share/mysql/test/suite/galera_sr/r/galera_sr_unit_statements.result
 share/mysql/test/suite/galera_sr/r/galera_sr_v1_row_events.result
@@ -9213,11 +9388,8 @@ share/mysql/test/suite/galera_sr/t/GCF-1008.inc
 share/mysql/test/suite/galera_sr/t/GCF-1008.test
 share/mysql/test/suite/galera_sr/t/GCF-1018.test
 share/mysql/test/suite/galera_sr/t/GCF-1018B.test
-share/mysql/test/suite/galera_sr/t/GCF-1043A.test
-share/mysql/test/suite/galera_sr/t/GCF-1043B.test
 share/mysql/test/suite/galera_sr/t/GCF-1051.test
 share/mysql/test/suite/galera_sr/t/GCF-1060.test
-share/mysql/test/suite/galera_sr/t/GCF-437.test
 share/mysql/test/suite/galera_sr/t/GCF-561.test
 share/mysql/test/suite/galera_sr/t/GCF-571.test
 share/mysql/test/suite/galera_sr/t/GCF-572.test
@@ -9234,6 +9406,8 @@ share/mysql/test/suite/galera_sr/t/GCF-889.test
 share/mysql/test/suite/galera_sr/t/GCF-900.test
 share/mysql/test/suite/galera_sr/t/MDEV-18585.cnf
 share/mysql/test/suite/galera_sr/t/MDEV-18585.test
+share/mysql/test/suite/galera_sr/t/MDEV-22616.test
+share/mysql/test/suite/galera_sr/t/MDEV-23623.test
 share/mysql/test/suite/galera_sr/t/galera-features#56.test
 share/mysql/test/suite/galera_sr/t/galera_sr_bf_abort.inc
 share/mysql/test/suite/galera_sr/t/galera_sr_bf_abort.test
@@ -9271,6 +9445,8 @@ share/mysql/test/suite/galera_sr/t/galera_sr_load_data_splitting.test
 share/mysql/test/suite/galera_sr/t/galera_sr_log_bin-master.opt
 share/mysql/test/suite/galera_sr/t/galera_sr_log_bin.test
 share/mysql/test/suite/galera_sr/t/galera_sr_many_fragments.test
+share/mysql/test/suite/galera_sr/t/galera_sr_multirow_rollback.combinations
+share/mysql/test/suite/galera_sr/t/galera_sr_multirow_rollback.test
 share/mysql/test/suite/galera_sr/t/galera_sr_myisam.test
 share/mysql/test/suite/galera_sr/t/galera_sr_mysqldump_sst.cnf
 share/mysql/test/suite/galera_sr/t/galera_sr_mysqldump_sst.test
@@ -9283,7 +9459,6 @@ share/mysql/test/suite/galera_sr/t/galera_sr_shutdown_master.test
 share/mysql/test/suite/galera_sr/t/galera_sr_shutdown_slave.test
 share/mysql/test/suite/galera_sr/t/galera_sr_small_gcache.cnf
 share/mysql/test/suite/galera_sr/t/galera_sr_small_gcache.test
-share/mysql/test/suite/galera_sr/t/galera_sr_table_contents.test
 share/mysql/test/suite/galera_sr/t/galera_sr_transaction_replay.test
 share/mysql/test/suite/galera_sr/t/galera_sr_unit_statements.test
 share/mysql/test/suite/galera_sr/t/galera_sr_v1_row_events-master.opt
@@ -9494,6 +9669,7 @@ share/mysql/test/suite/innodb/r/alter_algorithm,INPLACE.rdiff
 share/mysql/test/suite/innodb/r/alter_algorithm,INSTANT.rdiff
 share/mysql/test/suite/innodb/r/alter_algorithm,NOCOPY.rdiff
 share/mysql/test/suite/innodb/r/alter_algorithm.result
+share/mysql/test/suite/innodb/r/alter_algorithm2.result
 share/mysql/test/suite/innodb/r/alter_candidate_key.result
 share/mysql/test/suite/innodb/r/alter_copy.result
 share/mysql/test/suite/innodb/r/alter_crash.result
@@ -9502,6 +9678,7 @@ share/mysql/test/suite/innodb/r/alter_inplace_perfschema.result
 share/mysql/test/suite/innodb/r/alter_key_block_size-11757.result
 share/mysql/test/suite/innodb/r/alter_kill.result
 share/mysql/test/suite/innodb/r/alter_large_dml.result
+share/mysql/test/suite/innodb/r/alter_mdl_timeout.result
 share/mysql/test/suite/innodb/r/alter_missing_tablespace.result
 share/mysql/test/suite/innodb/r/alter_not_null,COPY,NON-STRICT.rdiff
 share/mysql/test/suite/innodb/r/alter_not_null,COPY,STRICT.rdiff
@@ -9512,6 +9689,7 @@ share/mysql/test/suite/innodb/r/alter_not_null_debug.result
 share/mysql/test/suite/innodb/r/alter_partitioned.result
 share/mysql/test/suite/innodb/r/alter_partitioned_debug.result
 share/mysql/test/suite/innodb/r/alter_partitioned_xa.result
+share/mysql/test/suite/innodb/r/alter_primary_key.result
 share/mysql/test/suite/innodb/r/alter_rename_existing.result
 share/mysql/test/suite/innodb/r/alter_rename_files.result
 share/mysql/test/suite/innodb/r/alter_table.result
@@ -9524,6 +9702,7 @@ share/mysql/test/suite/innodb/r/binlog_consistent.result
 share/mysql/test/suite/innodb/r/blob-crash.result
 share/mysql/test/suite/innodb/r/blob-update-debug.result
 share/mysql/test/suite/innodb/r/blob_unique2pk.result
+share/mysql/test/suite/innodb/r/buf_pool_resize_oom.result
 share/mysql/test/suite/innodb/r/check_ibd_filesize,32k.rdiff
 share/mysql/test/suite/innodb/r/check_ibd_filesize,4k.rdiff
 share/mysql/test/suite/innodb/r/check_ibd_filesize,64k.rdiff
@@ -9538,6 +9717,8 @@ share/mysql/test/suite/innodb/r/create_select.result
 share/mysql/test/suite/innodb/r/data_types.result
 share/mysql/test/suite/innodb/r/ddl_purge.result
 share/mysql/test/suite/innodb/r/deadlock_detect.result
+share/mysql/test/suite/innodb/r/default_row_format_alter,compact.rdiff
+share/mysql/test/suite/innodb/r/default_row_format_alter,redundant.rdiff
 share/mysql/test/suite/innodb/r/default_row_format_alter.result
 share/mysql/test/suite/innodb/r/default_row_format_compatibility.result
 share/mysql/test/suite/innodb/r/default_row_format_create,dynamic.rdiff
@@ -9551,6 +9732,7 @@ share/mysql/test/suite/innodb/r/dropdb.result
 share/mysql/test/suite/innodb/r/file_format_defaults.result
 share/mysql/test/suite/innodb/r/foreign-keys.result
 share/mysql/test/suite/innodb/r/foreign_key.result
+share/mysql/test/suite/innodb/r/foreign_key_debug.result
 share/mysql/test/suite/innodb/r/full_crc32_import.result
 share/mysql/test/suite/innodb/r/group_commit.result
 share/mysql/test/suite/innodb/r/group_commit_binlog_pos.result
@@ -9657,7 +9839,9 @@ share/mysql/test/suite/innodb/r/innodb_28867993.result
 share/mysql/test/suite/innodb/r/innodb_autoinc_lock_mode_zero.result
 share/mysql/test/suite/innodb/r/innodb_blob_truncate.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_dump_pct.result
+share/mysql/test/suite/innodb/r/innodb_buffer_pool_load_now.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_resize.result
+share/mysql/test/suite/innodb/r/innodb_buffer_pool_resize_debug.result
 share/mysql/test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result
 share/mysql/test/suite/innodb/r/innodb_bug11754376.result
 share/mysql/test/suite/innodb/r/innodb_bug12400341.result
@@ -9672,7 +9856,6 @@ share/mysql/test/suite/innodb/r/innodb_bug27216817.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_bug30919.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
 share/mysql/test/suite/innodb/r/innodb_bug38231.result
@@ -9738,6 +9921,7 @@ share/mysql/test/suite/innodb/r/innodb_defragment_fill_factor.result
 share/mysql/test/suite/innodb/r/innodb_defragment_small.result
 share/mysql/test/suite/innodb/r/innodb_force_pk.result
 share/mysql/test/suite/innodb/r/innodb_force_recovery.result
+share/mysql/test/suite/innodb/r/innodb_force_recovery_rollback.result
 share/mysql/test/suite/innodb/r/innodb_gis.result
 share/mysql/test/suite/innodb/r/innodb_information_schema.result
 share/mysql/test/suite/innodb/r/innodb_information_schema_buffer.result
@@ -9767,6 +9951,7 @@ share/mysql/test/suite/innodb/r/innodb_stats_persistent_debug.result
 share/mysql/test/suite/innodb/r/innodb_stats_rename_table.result
 share/mysql/test/suite/innodb/r/innodb_stats_rename_table_if_exists.result
 share/mysql/test/suite/innodb/r/innodb_sys_semaphore_waits.result
+share/mysql/test/suite/innodb/r/innodb_sys_var_valgrind.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_uninstall.result
@@ -9788,6 +9973,7 @@ share/mysql/test/suite/innodb/r/instant_alter_extend.result
 share/mysql/test/suite/innodb/r/instant_alter_import.result
 share/mysql/test/suite/innodb/r/instant_alter_index_rename.result
 share/mysql/test/suite/innodb/r/instant_alter_inject.result
+share/mysql/test/suite/innodb/r/instant_alter_limit,16k.rdiff
 share/mysql/test/suite/innodb/r/instant_alter_limit,32k.rdiff
 share/mysql/test/suite/innodb/r/instant_alter_limit,4k.rdiff
 share/mysql/test/suite/innodb/r/instant_alter_limit,64k.rdiff
@@ -9848,6 +10034,7 @@ share/mysql/test/suite/innodb/r/row_size_error_log_warnings_3.result
 share/mysql/test/suite/innodb/r/snapshot.result
 share/mysql/test/suite/innodb/r/sp_temp_table.result
 share/mysql/test/suite/innodb/r/stat_tables.result
+share/mysql/test/suite/innodb/r/stats_persistent.result
 share/mysql/test/suite/innodb/r/stored_fk.result
 share/mysql/test/suite/innodb/r/strict_mode.result
 share/mysql/test/suite/innodb/r/system_tables.result
@@ -9879,11 +10066,13 @@ share/mysql/test/suite/innodb/r/update_time.result
 share/mysql/test/suite/innodb/r/update_time_wl6658.result
 share/mysql/test/suite/innodb/r/xa_debug.result
 share/mysql/test/suite/innodb/r/xa_recovery.result
+share/mysql/test/suite/innodb/r/xa_recovery_debug.result
 share/mysql/test/suite/innodb/t/101_compatibility.test
 share/mysql/test/suite/innodb/t/add_constraint.test
 share/mysql/test/suite/innodb/t/alter_algorithm.combinations
 share/mysql/test/suite/innodb/t/alter_algorithm.inc
 share/mysql/test/suite/innodb/t/alter_algorithm.test
+share/mysql/test/suite/innodb/t/alter_algorithm2.test
 share/mysql/test/suite/innodb/t/alter_candidate_key.test
 share/mysql/test/suite/innodb/t/alter_copy.test
 share/mysql/test/suite/innodb/t/alter_crash.opt
@@ -9896,6 +10085,8 @@ share/mysql/test/suite/innodb/t/alter_kill-master.opt
 share/mysql/test/suite/innodb/t/alter_kill.test
 share/mysql/test/suite/innodb/t/alter_large_dml.opt
 share/mysql/test/suite/innodb/t/alter_large_dml.test
+share/mysql/test/suite/innodb/t/alter_mdl_timeout.opt
+share/mysql/test/suite/innodb/t/alter_mdl_timeout.test
 share/mysql/test/suite/innodb/t/alter_missing_tablespace.test
 share/mysql/test/suite/innodb/t/alter_non_null.inc
 share/mysql/test/suite/innodb/t/alter_not_null.combinations
@@ -9904,6 +10095,7 @@ share/mysql/test/suite/innodb/t/alter_not_null_debug.test
 share/mysql/test/suite/innodb/t/alter_partitioned.test
 share/mysql/test/suite/innodb/t/alter_partitioned_debug.test
 share/mysql/test/suite/innodb/t/alter_partitioned_xa.test
+share/mysql/test/suite/innodb/t/alter_primary_key.test
 share/mysql/test/suite/innodb/t/alter_rename_existing.test
 share/mysql/test/suite/innodb/t/alter_rename_files.test
 share/mysql/test/suite/innodb/t/alter_sql_mode.combinations
@@ -9919,6 +10111,8 @@ share/mysql/test/suite/innodb/t/binlog_consistent.test
 share/mysql/test/suite/innodb/t/blob-crash.test
 share/mysql/test/suite/innodb/t/blob-update-debug.test
 share/mysql/test/suite/innodb/t/blob_unique2pk.test
+share/mysql/test/suite/innodb/t/buf_pool_resize_oom.opt
+share/mysql/test/suite/innodb/t/buf_pool_resize_oom.test
 share/mysql/test/suite/innodb/t/check_ibd_filesize.test
 share/mysql/test/suite/innodb/t/corrupted_during_recovery.opt
 share/mysql/test/suite/innodb/t/corrupted_during_recovery.test
@@ -9944,6 +10138,7 @@ share/mysql/test/suite/innodb/t/dropdb.test
 share/mysql/test/suite/innodb/t/file_format_defaults.test
 share/mysql/test/suite/innodb/t/foreign-keys.test
 share/mysql/test/suite/innodb/t/foreign_key.test
+share/mysql/test/suite/innodb/t/foreign_key_debug.test
 share/mysql/test/suite/innodb/t/full_crc32_import.opt
 share/mysql/test/suite/innodb/t/full_crc32_import.test
 share/mysql/test/suite/innodb/t/group_commit.test
@@ -10082,8 +10277,12 @@ 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_blob_truncate.test
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_dump_pct.test
+share/mysql/test/suite/innodb/t/innodb_buffer_pool_load_now.opt
+share/mysql/test/suite/innodb/t/innodb_buffer_pool_load_now.test
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize.opt
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize.test
+share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize_debug.opt
+share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize_debug.test
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt
 share/mysql/test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
 share/mysql/test/suite/innodb/t/innodb_bug11754376.test
@@ -10103,7 +10302,6 @@ 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_bug30919-master.opt
 share/mysql/test/suite/innodb/t/innodb_bug30919.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
 share/mysql/test/suite/innodb/t/innodb_bug38231.test
@@ -10187,6 +10385,7 @@ share/mysql/test/suite/innodb/t/innodb_defragment_small.test
 share/mysql/test/suite/innodb/t/innodb_force_pk.opt
 share/mysql/test/suite/innodb/t/innodb_force_pk.test
 share/mysql/test/suite/innodb/t/innodb_force_recovery.test
+share/mysql/test/suite/innodb/t/innodb_force_recovery_rollback.test
 share/mysql/test/suite/innodb/t/innodb_gis.test
 share/mysql/test/suite/innodb/t/innodb_information_schema.test
 share/mysql/test/suite/innodb/t/innodb_information_schema_buffer.opt
@@ -10228,9 +10427,9 @@ share/mysql/test/suite/innodb/t/innodb_stats_rename_table.test
 share/mysql/test/suite/innodb/t/innodb_stats_rename_table_if_exists.test
 share/mysql/test/suite/innodb/t/innodb_sys_semaphore_waits-master.opt
 share/mysql/test/suite/innodb/t/innodb_sys_semaphore_waits.test
+share/mysql/test/suite/innodb/t/innodb_sys_var_valgrind.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.opt
 share/mysql/test/suite/innodb/t/innodb_trx_weight.test
 share/mysql/test/suite/innodb/t/innodb_uninstall.opt
 share/mysql/test/suite/innodb/t/innodb_uninstall.test
@@ -10297,6 +10496,7 @@ share/mysql/test/suite/innodb/t/row_size_error_log_warnings_3.test
 share/mysql/test/suite/innodb/t/snapshot.test
 share/mysql/test/suite/innodb/t/sp_temp_table.test
 share/mysql/test/suite/innodb/t/stat_tables.test
+share/mysql/test/suite/innodb/t/stats_persistent.test
 share/mysql/test/suite/innodb/t/stored_fk.test
 share/mysql/test/suite/innodb/t/strict_mode.test
 share/mysql/test/suite/innodb/t/system_tables.test
@@ -10326,12 +10526,14 @@ share/mysql/test/suite/innodb/t/undo_truncate.test
 share/mysql/test/suite/innodb/t/undo_truncate_recover.combinations
 share/mysql/test/suite/innodb/t/undo_truncate_recover.opt
 share/mysql/test/suite/innodb/t/undo_truncate_recover.test
+share/mysql/test/suite/innodb/t/update-cascade.combinations
 share/mysql/test/suite/innodb/t/update-cascade.test
 share/mysql/test/suite/innodb/t/update_time-master.opt
 share/mysql/test/suite/innodb/t/update_time.test
 share/mysql/test/suite/innodb/t/update_time_wl6658.test
 share/mysql/test/suite/innodb/t/xa_debug.test
 share/mysql/test/suite/innodb/t/xa_recovery.test
+share/mysql/test/suite/innodb/t/xa_recovery_debug.test
 share/mysql/test/suite/innodb_fts/r/basic.result
 share/mysql/test/suite/innodb_fts/r/concurrent_insert.result
 share/mysql/test/suite/innodb_fts/r/crash_recovery.result
@@ -10362,6 +10564,8 @@ share/mysql/test/suite/innodb_fts/r/innodb_fts_result_cache_limit.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_stopword_charset.result
 share/mysql/test/suite/innodb_fts/r/innodb_fts_transaction.result
 share/mysql/test/suite/innodb_fts/r/misc_debug.result
+share/mysql/test/suite/innodb_fts/r/misc_debug2.result
+share/mysql/test/suite/innodb_fts/r/stopword.result
 share/mysql/test/suite/innodb_fts/r/sync.result
 share/mysql/test/suite/innodb_fts/r/sync_block.result
 share/mysql/test/suite/innodb_fts/r/sync_ddl.result
@@ -10398,6 +10602,9 @@ share/mysql/test/suite/innodb_fts/t/innodb_fts_result_cache_limit.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_stopword_charset.test
 share/mysql/test/suite/innodb_fts/t/innodb_fts_transaction.test
 share/mysql/test/suite/innodb_fts/t/misc_debug.test
+share/mysql/test/suite/innodb_fts/t/misc_debug2.test
+share/mysql/test/suite/innodb_fts/t/stopword.opt
+share/mysql/test/suite/innodb_fts/t/stopword.test
 share/mysql/test/suite/innodb_fts/t/sync.opt
 share/mysql/test/suite/innodb_fts/t/sync.test
 share/mysql/test/suite/innodb_fts/t/sync_block.test
@@ -10807,11 +11014,15 @@ share/mysql/test/suite/maria/alter.result
 share/mysql/test/suite/maria/alter.test
 share/mysql/test/suite/maria/aria_pack_mdev14183.result
 share/mysql/test/suite/maria/aria_pack_mdev14183.test
+share/mysql/test/suite/maria/bulk_insert_crash.opt
+share/mysql/test/suite/maria/bulk_insert_crash.result
+share/mysql/test/suite/maria/bulk_insert_crash.test
 share/mysql/test/suite/maria/collations.result
 share/mysql/test/suite/maria/collations.test
 share/mysql/test/suite/maria/compat_aliases-master.opt
 share/mysql/test/suite/maria/concurrent.result
 share/mysql/test/suite/maria/concurrent.test
+share/mysql/test/suite/maria/create.opt
 share/mysql/test/suite/maria/create.result
 share/mysql/test/suite/maria/create.test
 share/mysql/test/suite/maria/disabled.def
@@ -10819,6 +11030,8 @@ share/mysql/test/suite/maria/distinct.result
 share/mysql/test/suite/maria/distinct.test
 share/mysql/test/suite/maria/dynamic.result
 share/mysql/test/suite/maria/dynamic.test
+share/mysql/test/suite/maria/encrypt-no-key.result
+share/mysql/test/suite/maria/encrypt-no-key.test
 share/mysql/test/suite/maria/encrypt-wrong-key.result
 share/mysql/test/suite/maria/encrypt-wrong-key.test
 share/mysql/test/suite/maria/fulltext2.result
@@ -10937,6 +11150,8 @@ share/mysql/test/suite/mariabackup/auth_plugin_win.result
 share/mysql/test/suite/mariabackup/auth_plugin_win.test
 share/mysql/test/suite/mariabackup/backup_grants.result
 share/mysql/test/suite/mariabackup/backup_grants.test
+share/mysql/test/suite/mariabackup/backup_lock_wait_timeout.result
+share/mysql/test/suite/mariabackup/backup_lock_wait_timeout.test
 share/mysql/test/suite/mariabackup/backup_ssl.result
 share/mysql/test/suite/mariabackup/backup_ssl.test
 share/mysql/test/suite/mariabackup/big_innodb_log.result
@@ -10951,6 +11166,9 @@ share/mysql/test/suite/mariabackup/create_with_data_directory_during_backup.resu
 share/mysql/test/suite/mariabackup/create_with_data_directory_during_backup.test
 share/mysql/test/suite/mariabackup/data_directory.result
 share/mysql/test/suite/mariabackup/data_directory.test
+share/mysql/test/suite/mariabackup/ddl_incremental_encrypted.opt
+share/mysql/test/suite/mariabackup/ddl_incremental_encrypted.result
+share/mysql/test/suite/mariabackup/ddl_incremental_encrypted.test
 share/mysql/test/suite/mariabackup/drop_table_during_backup.result
 share/mysql/test/suite/mariabackup/drop_table_during_backup.test
 share/mysql/test/suite/mariabackup/encrypted_page_compressed.opt
@@ -10973,6 +11191,7 @@ share/mysql/test/suite/mariabackup/huge_lsn.combinations
 share/mysql/test/suite/mariabackup/huge_lsn.opt
 share/mysql/test/suite/mariabackup/huge_lsn.result
 share/mysql/test/suite/mariabackup/huge_lsn.test
+share/mysql/test/suite/mariabackup/include/corrupt-page.pl
 share/mysql/test/suite/mariabackup/include/have_rocksdb.inc
 share/mysql/test/suite/mariabackup/include/restart_and_restore.inc
 share/mysql/test/suite/mariabackup/incremental_backup.result
@@ -10992,11 +11211,19 @@ share/mysql/test/suite/mariabackup/innodb_log_optimize_ddl.test
 share/mysql/test/suite/mariabackup/innodb_redo_log_overwrite.opt
 share/mysql/test/suite/mariabackup/innodb_redo_log_overwrite.result
 share/mysql/test/suite/mariabackup/innodb_redo_log_overwrite.test
+share/mysql/test/suite/mariabackup/innodb_redo_overwrite.opt
+share/mysql/test/suite/mariabackup/innodb_redo_overwrite.result
+share/mysql/test/suite/mariabackup/innodb_redo_overwrite.test
+share/mysql/test/suite/mariabackup/innodb_xa_rollback.result
+share/mysql/test/suite/mariabackup/innodb_xa_rollback.test
 share/mysql/test/suite/mariabackup/lock_ddl_per_table.opt
 share/mysql/test/suite/mariabackup/lock_ddl_per_table.result
 share/mysql/test/suite/mariabackup/lock_ddl_per_table.test
 share/mysql/test/suite/mariabackup/log_checksum_mismatch.result
 share/mysql/test/suite/mariabackup/log_checksum_mismatch.test
+share/mysql/test/suite/mariabackup/log_page_corruption.opt
+share/mysql/test/suite/mariabackup/log_page_corruption.result
+share/mysql/test/suite/mariabackup/log_page_corruption.test
 share/mysql/test/suite/mariabackup/mdev-14447.opt
 share/mysql/test/suite/mariabackup/mdev-14447.result
 share/mysql/test/suite/mariabackup/mdev-14447.test
@@ -11008,10 +11235,13 @@ share/mysql/test/suite/mariabackup/mlog_index_load.result
 share/mysql/test/suite/mariabackup/mlog_index_load.test
 share/mysql/test/suite/mariabackup/nolock_ddl_during_backup_end.result
 share/mysql/test/suite/mariabackup/nolock_ddl_during_backup_end.test
+share/mysql/test/suite/mariabackup/options_check.result
+share/mysql/test/suite/mariabackup/options_check.test
 share/mysql/test/suite/mariabackup/page_compression_level.result
 share/mysql/test/suite/mariabackup/page_compression_level.test
 share/mysql/test/suite/mariabackup/partial.result
 share/mysql/test/suite/mariabackup/partial.test
+share/mysql/test/suite/mariabackup/partial_exclude.opt
 share/mysql/test/suite/mariabackup/partial_exclude.result
 share/mysql/test/suite/mariabackup/partial_exclude.test
 share/mysql/test/suite/mariabackup/partition_datadir.result
@@ -11025,6 +11255,8 @@ share/mysql/test/suite/mariabackup/rename_during_backup.result
 share/mysql/test/suite/mariabackup/rename_during_backup.test
 share/mysql/test/suite/mariabackup/rename_during_mdl_lock.result
 share/mysql/test/suite/mariabackup/rename_during_mdl_lock.test
+share/mysql/test/suite/mariabackup/rpl_slave_info.result
+share/mysql/test/suite/mariabackup/rpl_slave_info.test
 share/mysql/test/suite/mariabackup/skip_innodb.opt
 share/mysql/test/suite/mariabackup/skip_innodb.result
 share/mysql/test/suite/mariabackup/skip_innodb.test
@@ -11315,6 +11547,7 @@ share/mysql/test/suite/parts/r/partition_alter3_myisam.result
 share/mysql/test/suite/parts/r/partition_alter4_innodb.result
 share/mysql/test/suite/parts/r/partition_alter4_myisam.result
 share/mysql/test/suite/parts/r/partition_alter_innodb.result
+share/mysql/test/suite/parts/r/partition_alter_instant.result
 share/mysql/test/suite/parts/r/partition_alter_maria.result
 share/mysql/test/suite/parts/r/partition_alter_myisam.result
 share/mysql/test/suite/parts/r/partition_auto_increment_archive.result
@@ -11409,6 +11642,7 @@ share/mysql/test/suite/parts/r/partition_tinyint_myisam.result
 share/mysql/test/suite/parts/r/partition_value_innodb.result
 share/mysql/test/suite/parts/r/partition_value_myisam.result
 share/mysql/test/suite/parts/r/print_error.result
+share/mysql/test/suite/parts/r/reorganize.result
 share/mysql/test/suite/parts/r/reorganize_partition_innodb.result
 share/mysql/test/suite/parts/r/rpl_partition.result
 share/mysql/test/suite/parts/r/show_create.result
@@ -11444,6 +11678,7 @@ share/mysql/test/suite/parts/t/partition_alter3_myisam.test
 share/mysql/test/suite/parts/t/partition_alter4_innodb.test
 share/mysql/test/suite/parts/t/partition_alter4_myisam.test
 share/mysql/test/suite/parts/t/partition_alter_innodb.test
+share/mysql/test/suite/parts/t/partition_alter_instant.test
 share/mysql/test/suite/parts/t/partition_alter_maria.test
 share/mysql/test/suite/parts/t/partition_alter_myisam.test
 share/mysql/test/suite/parts/t/partition_auto_increment_archive.test
@@ -11552,6 +11787,7 @@ share/mysql/test/suite/parts/t/partition_tinyint_myisam.test
 share/mysql/test/suite/parts/t/partition_value_innodb.test
 share/mysql/test/suite/parts/t/partition_value_myisam.test
 share/mysql/test/suite/parts/t/print_error.test
+share/mysql/test/suite/parts/t/reorganize.test
 share/mysql/test/suite/parts/t/reorganize_partition_innodb.test
 share/mysql/test/suite/parts/t/rpl_partition.test
 share/mysql/test/suite/parts/t/show_create.test
@@ -12479,6 +12715,8 @@ share/mysql/test/suite/roles/default_create_user_not_role.result
 share/mysql/test/suite/roles/default_create_user_not_role.test
 share/mysql/test/suite/roles/definer.result
 share/mysql/test/suite/roles/definer.test
+share/mysql/test/suite/roles/drop_current_role.result
+share/mysql/test/suite/roles/drop_current_role.test
 share/mysql/test/suite/roles/drop_current_user-5176.result
 share/mysql/test/suite/roles/drop_current_user-5176.test
 share/mysql/test/suite/roles/drop_routines.result
@@ -12701,6 +12939,7 @@ share/mysql/test/suite/rpl/r/last_insert_id.result
 share/mysql/test/suite/rpl/r/mdev_17588.result
 share/mysql/test/suite/rpl/r/myisam_external_lock.result
 share/mysql/test/suite/rpl/r/mysql-wsrep#110-2.result
+share/mysql/test/suite/rpl/r/parallel_backup.result
 share/mysql/test/suite/rpl/r/parallel_conflicts.result
 share/mysql/test/suite/rpl/r/password_expiration.result
 share/mysql/test/suite/rpl/r/rename.result
@@ -12728,6 +12967,7 @@ share/mysql/test/suite/rpl/r/rpl_autogen_query_multi_byte_char.result
 share/mysql/test/suite/rpl/r/rpl_begin_commit_rollback.result
 share/mysql/test/suite/rpl/r/rpl_binlog_compress.result
 share/mysql/test/suite/rpl/r/rpl_binlog_corruption.result
+share/mysql/test/suite/rpl/r/rpl_binlog_dump_slave_gtid_state_info.result
 share/mysql/test/suite/rpl/r/rpl_binlog_dup_entry.result
 share/mysql/test/suite/rpl/r/rpl_binlog_errors.result
 share/mysql/test/suite/rpl/r/rpl_binlog_grant.result
@@ -12792,9 +13032,10 @@ share/mysql/test/suite/rpl/r/rpl_drop.result
 share/mysql/test/suite/rpl/r/rpl_drop_db.result
 share/mysql/test/suite/rpl/r/rpl_drop_db_fail.result
 share/mysql/test/suite/rpl/r/rpl_drop_temp.result
-share/mysql/test/suite/rpl/r/rpl_drop_temp_table_invaid_lex.result
+share/mysql/test/suite/rpl/r/rpl_drop_temp_table_invalid_lex.result
 share/mysql/test/suite/rpl/r/rpl_drop_view.result
 share/mysql/test/suite/rpl/r/rpl_dual_pos_advance.result
+share/mysql/test/suite/rpl/r/rpl_dump_request_retry_warning.result
 share/mysql/test/suite/rpl/r/rpl_empty_master_host.result
 share/mysql/test/suite/rpl/r/rpl_err_ignoredtable.result
 share/mysql/test/suite/rpl/r/rpl_events.result
@@ -12802,7 +13043,7 @@ share/mysql/test/suite/rpl/r/rpl_extra_col_master_innodb.result
 share/mysql/test/suite/rpl/r/rpl_extra_col_master_myisam.result
 share/mysql/test/suite/rpl/r/rpl_extra_col_slave_innodb.result
 share/mysql/test/suite/rpl/r/rpl_extra_col_slave_myisam.result
-share/mysql/test/suite/rpl/r/rpl_failed_drop_tbl_binlog.result
+share/mysql/test/suite/rpl/r/rpl_fail_register.result
 share/mysql/test/suite/rpl/r/rpl_failed_optimize.result
 share/mysql/test/suite/rpl/r/rpl_filter_dbs_dynamic.result
 share/mysql/test/suite/rpl/r/rpl_filter_tables_dynamic.result
@@ -12941,6 +13182,7 @@ share/mysql/test/suite/rpl/r/rpl_parallel_multilevel2.result
 share/mysql/test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result
 share/mysql/test/suite/rpl/r/rpl_parallel_optimistic.result
 share/mysql/test/suite/rpl/r/rpl_parallel_optimistic_nobinlog.result
+share/mysql/test/suite/rpl/r/rpl_parallel_optimistic_until.result
 share/mysql/test/suite/rpl/r/rpl_parallel_partition.result
 share/mysql/test/suite/rpl/r/rpl_parallel_retry.result
 share/mysql/test/suite/rpl/r/rpl_parallel_show_binlog_events_purge_logs.result
@@ -12958,6 +13200,7 @@ share/mysql/test/suite/rpl/r/rpl_read_new_relay_log_info.result
 share/mysql/test/suite/rpl/r/rpl_read_old_relay_log_info.result
 share/mysql/test/suite/rpl/r/rpl_read_only.result
 share/mysql/test/suite/rpl/r/rpl_read_only2.result
+share/mysql/test/suite/rpl/r/rpl_relay_max_extension.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_innodb.result
 share/mysql/test/suite/rpl/r/rpl_relay_space_myisam.result
 share/mysql/test/suite/rpl/r/rpl_relayrotate.result
@@ -13053,7 +13296,9 @@ share/mysql/test/suite/rpl/r/rpl_row_unsafe_funcs.result
 share/mysql/test/suite/rpl/r/rpl_row_until.result
 share/mysql/test/suite/rpl/r/rpl_row_utf16.result
 share/mysql/test/suite/rpl/r/rpl_row_utf32.result
+share/mysql/test/suite/rpl/r/rpl_row_vcol_crash.result
 share/mysql/test/suite/rpl/r/rpl_row_view01.result
+share/mysql/test/suite/rpl/r/rpl_row_virt.result
 share/mysql/test/suite/rpl/r/rpl_row_wide_table.result
 share/mysql/test/suite/rpl/r/rpl_savepoint.result
 share/mysql/test/suite/rpl/r/rpl_semi_sync.result
@@ -13206,6 +13451,7 @@ share/mysql/test/suite/rpl/t/mdev_17588.test
 share/mysql/test/suite/rpl/t/myisam_external_lock-slave.opt
 share/mysql/test/suite/rpl/t/myisam_external_lock.test
 share/mysql/test/suite/rpl/t/mysql-wsrep#110-2.test
+share/mysql/test/suite/rpl/t/parallel_backup.test
 share/mysql/test/suite/rpl/t/password_expiration.test
 share/mysql/test/suite/rpl/t/rename.test
 share/mysql/test/suite/rpl/t/replace.test
@@ -13237,6 +13483,7 @@ share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback-slave.opt
 share/mysql/test/suite/rpl/t/rpl_begin_commit_rollback.test
 share/mysql/test/suite/rpl/t/rpl_binlog_compress.test
 share/mysql/test/suite/rpl/t/rpl_binlog_corruption.test
+share/mysql/test/suite/rpl/t/rpl_binlog_dump_slave_gtid_state_info.test
 share/mysql/test/suite/rpl/t/rpl_binlog_dup_entry.test
 share/mysql/test/suite/rpl/t/rpl_binlog_errors-master.opt
 share/mysql/test/suite/rpl/t/rpl_binlog_errors.test
@@ -13255,7 +13502,6 @@ share/mysql/test/suite/rpl/t/rpl_bug33931.test
 share/mysql/test/suite/rpl/t/rpl_bug37426.test
 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_cant_read_event_incident.test
 share/mysql/test/suite/rpl/t/rpl_change_master.test
@@ -13317,9 +13563,10 @@ share/mysql/test/suite/rpl/t/rpl_drop_db.test
 share/mysql/test/suite/rpl/t/rpl_drop_db_fail.test
 share/mysql/test/suite/rpl/t/rpl_drop_temp-slave.opt
 share/mysql/test/suite/rpl/t/rpl_drop_temp.test
-share/mysql/test/suite/rpl/t/rpl_drop_temp_table_invaid_lex.test
+share/mysql/test/suite/rpl/t/rpl_drop_temp_table_invalid_lex.test
 share/mysql/test/suite/rpl/t/rpl_drop_view.test
 share/mysql/test/suite/rpl/t/rpl_dual_pos_advance.test
+share/mysql/test/suite/rpl/t/rpl_dump_request_retry_warning.test
 share/mysql/test/suite/rpl/t/rpl_empty_master_host.test
 share/mysql/test/suite/rpl/t/rpl_err_ignoredtable-slave.opt
 share/mysql/test/suite/rpl/t/rpl_err_ignoredtable.test
@@ -13328,7 +13575,7 @@ share/mysql/test/suite/rpl/t/rpl_extra_col_master_innodb.test
 share/mysql/test/suite/rpl/t/rpl_extra_col_master_myisam.test
 share/mysql/test/suite/rpl/t/rpl_extra_col_slave_innodb.test
 share/mysql/test/suite/rpl/t/rpl_extra_col_slave_myisam.test
-share/mysql/test/suite/rpl/t/rpl_failed_drop_tbl_binlog.test
+share/mysql/test/suite/rpl/t/rpl_fail_register.test
 share/mysql/test/suite/rpl/t/rpl_failed_optimize.test
 share/mysql/test/suite/rpl/t/rpl_filter_dbs_dynamic.test
 share/mysql/test/suite/rpl/t/rpl_filter_tables_dynamic.test
@@ -13525,6 +13772,7 @@ share/mysql/test/suite/rpl/t/rpl_parallel_no_log_slave_updates.test
 share/mysql/test/suite/rpl/t/rpl_parallel_optimistic.test
 share/mysql/test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.cnf
 share/mysql/test/suite/rpl/t/rpl_parallel_optimistic_nobinlog.test
+share/mysql/test/suite/rpl/t/rpl_parallel_optimistic_until.test
 share/mysql/test/suite/rpl/t/rpl_parallel_partition.test
 share/mysql/test/suite/rpl/t/rpl_parallel_retry.test
 share/mysql/test/suite/rpl/t/rpl_parallel_show_binlog_events_purge_logs.test
@@ -13544,6 +13792,7 @@ share/mysql/test/suite/rpl/t/rpl_read_new_relay_log_info.test
 share/mysql/test/suite/rpl/t/rpl_read_old_relay_log_info.test
 share/mysql/test/suite/rpl/t/rpl_read_only.test
 share/mysql/test/suite/rpl/t/rpl_read_only2.test
+share/mysql/test/suite/rpl/t/rpl_relay_max_extension.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_innodb.test
 share/mysql/test/suite/rpl/t/rpl_relay_space_myisam.test
 share/mysql/test/suite/rpl/t/rpl_relayrotate-slave.opt
@@ -13662,7 +13911,9 @@ share/mysql/test/suite/rpl/t/rpl_row_unsafe_funcs.test
 share/mysql/test/suite/rpl/t/rpl_row_until.test
 share/mysql/test/suite/rpl/t/rpl_row_utf16.test
 share/mysql/test/suite/rpl/t/rpl_row_utf32.test
+share/mysql/test/suite/rpl/t/rpl_row_vcol_crash.test
 share/mysql/test/suite/rpl/t/rpl_row_view01.test
+share/mysql/test/suite/rpl/t/rpl_row_virt.test
 share/mysql/test/suite/rpl/t/rpl_row_wide_table.test
 share/mysql/test/suite/rpl/t/rpl_savepoint.test
 share/mysql/test/suite/rpl/t/rpl_semi_sync.test
@@ -13727,7 +13978,6 @@ share/mysql/test/suite/rpl/t/rpl_sp_effects-master.opt
 share/mysql/test/suite/rpl/t/rpl_sp_effects-slave.opt
 share/mysql/test/suite/rpl/t/rpl_sp_effects.test
 share/mysql/test/suite/rpl/t/rpl_sp_variables.test
-share/mysql/test/suite/rpl/t/rpl_spec_variables-slave.opt
 share/mysql/test/suite/rpl/t/rpl_spec_variables.test
 share/mysql/test/suite/rpl/t/rpl_special_charset.opt
 share/mysql/test/suite/rpl/t/rpl_special_charset.test
@@ -13856,6 +14106,8 @@ share/mysql/test/suite/sql_sequence/gtid-master.opt
 share/mysql/test/suite/sql_sequence/gtid-slave.opt
 share/mysql/test/suite/sql_sequence/gtid.result
 share/mysql/test/suite/sql_sequence/gtid.test
+share/mysql/test/suite/sql_sequence/kill.result
+share/mysql/test/suite/sql_sequence/kill.test
 share/mysql/test/suite/sql_sequence/lock.result
 share/mysql/test/suite/sql_sequence/lock.test
 share/mysql/test/suite/sql_sequence/mysqldump.result
@@ -14191,11 +14443,13 @@ share/mysql/test/suite/stress/r/ddl_csv.result
 share/mysql/test/suite/stress/r/ddl_innodb.result
 share/mysql/test/suite/stress/r/ddl_memory.result
 share/mysql/test/suite/stress/r/ddl_myisam.result
+share/mysql/test/suite/stress/r/misc.result
 share/mysql/test/suite/stress/t/ddl_archive.test
 share/mysql/test/suite/stress/t/ddl_csv.test
 share/mysql/test/suite/stress/t/ddl_innodb.test
 share/mysql/test/suite/stress/t/ddl_memory.test
 share/mysql/test/suite/stress/t/ddl_myisam.test
+share/mysql/test/suite/stress/t/misc.test
 share/mysql/test/suite/stress/t/wrapper.test
 share/mysql/test/suite/sys_vars/disabled.def
 share/mysql/test/suite/sys_vars/inc/autocommit_func2.inc
@@ -14207,6 +14461,7 @@ share/mysql/test/suite/sys_vars/inc/secure_timestamp_func.inc
 share/mysql/test/suite/sys_vars/inc/sysvars_server.inc
 share/mysql/test/suite/sys_vars/inc/sysvars_server.opt
 share/mysql/test/suite/sys_vars/r/all_vars.result
+share/mysql/test/suite/sys_vars/r/alter_algorithm_basic.result
 share/mysql/test/suite/sys_vars/r/aria_block_size_basic.result
 share/mysql/test/suite/sys_vars/r/aria_checkpoint_interval_basic.result
 share/mysql/test/suite/sys_vars/r/aria_checkpoint_log_activity_basic.result
@@ -14463,6 +14718,7 @@ 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_immediate_scrub_data_uncompressed_basic.result
+share/mysql/test/suite/sys_vars/r/innodb_instant_alter_column_allowed_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
@@ -14626,7 +14882,6 @@ share/mysql/test/suite/sys_vars/r/max_prepared_stmt_count_func.result
 share/mysql/test/suite/sys_vars/r/max_relay_log_size_basic.result
 share/mysql/test/suite/sys_vars/r/max_seeks_for_key_basic.result
 share/mysql/test/suite/sys_vars/r/max_seeks_for_key_func.result
-share/mysql/test/suite/sys_vars/r/max_sort_length_basic.result
 share/mysql/test/suite/sys_vars/r/max_sort_length_func.result
 share/mysql/test/suite/sys_vars/r/max_sp_recursion_depth_basic.result
 share/mysql/test/suite/sys_vars/r/max_sp_recursion_depth_func.result
@@ -14934,11 +15189,8 @@ share/mysql/test/suite/sys_vars/r/wsrep_mysql_replication_bundle_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_node_address_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_node_incoming_address_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_node_name_basic.result
-share/mysql/test/suite/sys_vars/r/wsrep_notify_cmd_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_on_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_osu_method_basic.result
-share/mysql/test/suite/sys_vars/r/wsrep_provider_basic.result
-share/mysql/test/suite/sys_vars/r/wsrep_provider_options_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_recover_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_restart_slave_basic.result
@@ -14951,10 +15203,10 @@ share/mysql/test/suite/sys_vars/r/wsrep_sst_donor_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_sst_donor_rejects_queries_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_sst_method_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_sst_receive_address_basic.result
-share/mysql/test/suite/sys_vars/r/wsrep_start_position_basic.result
 share/mysql/test/suite/sys_vars/r/wsrep_sync_wait_basic.result
 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/alter_algorithm_basic.test
 share/mysql/test/suite/sys_vars/t/aria_block_size_basic.test
 share/mysql/test/suite/sys_vars/t/aria_checkpoint_interval_basic.test
 share/mysql/test/suite/sys_vars/t/aria_checkpoint_log_activity_basic.test
@@ -15229,6 +15481,7 @@ 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_immediate_scrub_data_uncompressed_basic.test
+share/mysql/test/suite/sys_vars/t/innodb_instant_alter_column_allowed_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
@@ -15395,7 +15648,6 @@ share/mysql/test/suite/sys_vars/t/max_prepared_stmt_count_func.test
 share/mysql/test/suite/sys_vars/t/max_relay_log_size_basic.test
 share/mysql/test/suite/sys_vars/t/max_seeks_for_key_basic.test
 share/mysql/test/suite/sys_vars/t/max_seeks_for_key_func.test
-share/mysql/test/suite/sys_vars/t/max_sort_length_basic.test
 share/mysql/test/suite/sys_vars/t/max_sort_length_func.test
 share/mysql/test/suite/sys_vars/t/max_sp_recursion_depth_basic.test
 share/mysql/test/suite/sys_vars/t/max_sp_recursion_depth_func.test
@@ -15758,12 +16010,8 @@ share/mysql/test/suite/sys_vars/t/wsrep_mysql_replication_bundle_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_node_address_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_node_incoming_address_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_node_name_basic.test
-share/mysql/test/suite/sys_vars/t/wsrep_notify_cmd_basic.test
-share/mysql/test/suite/sys_vars/t/wsrep_on_basic.opt
 share/mysql/test/suite/sys_vars/t/wsrep_on_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_osu_method_basic.test
-share/mysql/test/suite/sys_vars/t/wsrep_provider_basic.test
-share/mysql/test/suite/sys_vars/t/wsrep_provider_options_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_recover_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_restart_slave_basic.test
@@ -15776,7 +16024,6 @@ share/mysql/test/suite/sys_vars/t/wsrep_sst_donor_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_sst_donor_rejects_queries_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_sst_method_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_sst_receive_address_basic.test
-share/mysql/test/suite/sys_vars/t/wsrep_start_position_basic.test
 share/mysql/test/suite/sys_vars/t/wsrep_sync_wait_basic.test
 share/mysql/test/suite/unit/suite.pm
 share/mysql/test/suite/vcol/disabled.def
@@ -15984,13 +16231,20 @@ share/mysql/test/suite/versioning/t/update.test
 share/mysql/test/suite/versioning/t/view.test
 share/mysql/test/suite/versioning/wait_system_clock.inc
 share/mysql/test/suite/wsrep/README
+share/mysql/test/suite/wsrep/common.pm
 share/mysql/test/suite/wsrep/disabled.def
 share/mysql/test/suite/wsrep/include/check_galera_version.inc
 share/mysql/test/suite/wsrep/my.cnf
+share/mysql/test/suite/wsrep/r/MDEV-20625.result
+share/mysql/test/suite/wsrep/r/MDEV-22443.result
+share/mysql/test/suite/wsrep/r/MDEV-23081.result
+share/mysql/test/suite/wsrep/r/MDEV-23092.result
+share/mysql/test/suite/wsrep/r/MDEV-23466.result
 share/mysql/test/suite/wsrep/r/alter_table_innodb.result
 share/mysql/test/suite/wsrep/r/binlog_format.result
 share/mysql/test/suite/wsrep/r/foreign_key.result
 share/mysql/test/suite/wsrep/r/mdev_10186.result
+share/mysql/test/suite/wsrep/r/mdev_22681.result
 share/mysql/test/suite/wsrep/r/mdev_6832.result
 share/mysql/test/suite/wsrep/r/mdev_7798.result
 share/mysql/test/suite/wsrep/r/mysql_tzinfo_to_sql_symlink.result
@@ -15999,11 +16253,25 @@ share/mysql/test/suite/wsrep/r/plugin.result
 share/mysql/test/suite/wsrep/r/pool_of_threads.result
 share/mysql/test/suite/wsrep/r/trans.result
 share/mysql/test/suite/wsrep/r/variables.result
+share/mysql/test/suite/wsrep/r/variables_debug.result
 share/mysql/test/suite/wsrep/r/wsrep-recover-v25,binlogon.rdiff
 share/mysql/test/suite/wsrep/r/wsrep-recover-v25.result
 share/mysql/test/suite/wsrep/r/wsrep-recover.result
 share/mysql/test/suite/wsrep/r/wsrep_rpl.result
+share/mysql/test/suite/wsrep/r/wsrep_variables_no_provider.result
+share/mysql/test/suite/wsrep/r/wsrep_variables_wsrep_off.result
 share/mysql/test/suite/wsrep/suite.pm
+share/mysql/test/suite/wsrep/t/MDEV-20625.cnf
+share/mysql/test/suite/wsrep/t/MDEV-20625.test
+share/mysql/test/suite/wsrep/t/MDEV-22443.cnf
+share/mysql/test/suite/wsrep/t/MDEV-22443.test
+share/mysql/test/suite/wsrep/t/MDEV-23081.cnf
+share/mysql/test/suite/wsrep/t/MDEV-23081.combinations
+share/mysql/test/suite/wsrep/t/MDEV-23081.test
+share/mysql/test/suite/wsrep/t/MDEV-23092.cnf
+share/mysql/test/suite/wsrep/t/MDEV-23092.test
+share/mysql/test/suite/wsrep/t/MDEV-23466.cnf
+share/mysql/test/suite/wsrep/t/MDEV-23466.test
 share/mysql/test/suite/wsrep/t/alter_table_innodb.cnf
 share/mysql/test/suite/wsrep/t/alter_table_innodb.test
 share/mysql/test/suite/wsrep/t/binlog_format.cnf
@@ -16013,6 +16281,8 @@ share/mysql/test/suite/wsrep/t/foreign_key.opt
 share/mysql/test/suite/wsrep/t/foreign_key.test
 share/mysql/test/suite/wsrep/t/mdev_10186.cnf
 share/mysql/test/suite/wsrep/t/mdev_10186.test
+share/mysql/test/suite/wsrep/t/mdev_22681.cnf
+share/mysql/test/suite/wsrep/t/mdev_22681.test
 share/mysql/test/suite/wsrep/t/mdev_6832.cnf
 share/mysql/test/suite/wsrep/t/mdev_6832.test
 share/mysql/test/suite/wsrep/t/mdev_7798.cnf
@@ -16027,8 +16297,10 @@ share/mysql/test/suite/wsrep/t/pool_of_threads.opt
 share/mysql/test/suite/wsrep/t/pool_of_threads.test
 share/mysql/test/suite/wsrep/t/trans.opt
 share/mysql/test/suite/wsrep/t/trans.test
-share/mysql/test/suite/wsrep/t/variables.opt
+share/mysql/test/suite/wsrep/t/variables.cnf
 share/mysql/test/suite/wsrep/t/variables.test
+share/mysql/test/suite/wsrep/t/variables_debug.cnf
+share/mysql/test/suite/wsrep/t/variables_debug.test
 share/mysql/test/suite/wsrep/t/wsrep-recover-step.inc
 share/mysql/test/suite/wsrep/t/wsrep-recover-v25.cnf
 share/mysql/test/suite/wsrep/t/wsrep-recover-v25.combinations
@@ -16038,6 +16310,10 @@ share/mysql/test/suite/wsrep/t/wsrep-recover.combinations
 share/mysql/test/suite/wsrep/t/wsrep-recover.test
 share/mysql/test/suite/wsrep/t/wsrep_rpl.cnf
 share/mysql/test/suite/wsrep/t/wsrep_rpl.test
+share/mysql/test/suite/wsrep/t/wsrep_variables_no_provider.cnf
+share/mysql/test/suite/wsrep/t/wsrep_variables_no_provider.test
+share/mysql/test/suite/wsrep/t/wsrep_variables_wsrep_off.cnf
+share/mysql/test/suite/wsrep/t/wsrep_variables_wsrep_off.test
 share/mysql/test/unstable-tests
 share/mysql/test/valgrind.supp
 share/mysql/ukrainian/errmsg.sys
diff --git a/mariadb104-server/PLIST.embedded b/mariadb104-server/PLIST.embedded
index 7e48d3fe75..c3fc8fd9b6 100644
--- a/mariadb104-server/PLIST.embedded
+++ b/mariadb104-server/PLIST.embedded
@@ -12,4 +12,3 @@ lib/libmariadbd.so
 lib/libmariadbd.so.19
 lib/libmysqld.a
 lib/libmysqld.so
-