update to MariaDB 10.9.3, getting us onto 10.9.x for 7.2-stable,

and fixing some crash recovery and assertion bugs
https://mariadb.org/regressions-in-recent-mariadb-server-releases/

from Brad.

databases/mariadb/Makefile

@@ -2,11 +2,9 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
 
-VERSION=	10.8.4
+VERSION=	10.9.3
 DISTNAME=	mariadb-${VERSION}
 PKGNAME-main=	mariadb-client-${VERSION}
-REVISION-server= 1
-REVISION-tests=	0
 EPOCH=		1
 
 CATEGORIES=	databases
@@ -44,7 +42,7 @@ BUILD_DEPENDS=	devel/bison \
 		devel/fmt
 
 LIB_DEPENDS-main=	${LIB_DEPENDS}
-RUN_DEPENDS-server=	${BASE_PKGPATH},-main>=10.8v1,<10.9v1 \
+RUN_DEPENDS-server=	${BASE_PKGPATH},-main>=10.9v1,<10.10v1 \
 			databases/p5-DBD-MariaDB
 LIB_DEPENDS-server=	${LIB_DEPENDS} \
 			archivers/bzip2 \
@@ -56,7 +54,7 @@ LIB_DEPENDS-server=	${LIB_DEPENDS} \
 			devel/pcre2 \
 			net/curl \
 			textproc/libxml
-RUN_DEPENDS-tests=	${BASE_PKGPATH},-main>=10.8v1,<10.9v1
+RUN_DEPENDS-tests=	${BASE_PKGPATH},-main>=10.9v1,<10.10v1
 LIB_DEPENDS-tests=	${LIB_DEPENDS} \
 			devel/pcre2
 

databases/mariadb/distinfo

@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.8.4.tar.gz) = ZexgyjZYjs0RzYw/wM414dYDAp4SN4z4i6qGX9CJEWY=
-SIZE (mariadb-10.8.4.tar.gz) = 97268852
+SHA256 (mariadb-10.9.3.tar.gz) = mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=
+SIZE (mariadb-10.9.3.tar.gz) = 97243702

databases/mariadb/patches/patch-config_h_cmake

@@ -1,26 +0,0 @@
-MDEV-28592 disks plugin - getmntinfo (BSD) & getmntent (AIX)
-129616c70a69f5e0fe2f10bdd0e2785594305e44
-
-Index: config.h.cmake
---- config.h.cmake.orig
-+++ config.h.cmake
-@@ -35,6 +35,11 @@
- #cmakedefine HAVE_FLOAT_H 1
- #cmakedefine HAVE_FNMATCH_H 1
- #cmakedefine HAVE_FPU_CONTROL_H 1
-+#cmakedefine HAVE_GETMNTENT 1
-+#cmakedefine HAVE_GETMNTENT_IN_SYS_MNTAB 1
-+#cmakedefine HAVE_GETMNTINFO 1
-+#cmakedefine HAVE_GETMNTINFO64 1
-+#cmakedefine HAVE_GETMNTINFO_TAKES_statvfs 1
- #cmakedefine HAVE_GRP_H 1
- #cmakedefine HAVE_IA64INTRIN_H 1
- #cmakedefine HAVE_IEEEFP_H 1
-@@ -210,6 +215,7 @@
- #cmakedefine HAVE_SELECT 1
- #cmakedefine HAVE_SETENV 1
- #cmakedefine HAVE_SETLOCALE 1
-+#cmakedefine HAVE_SETMNTENT 1
- #cmakedefine HAVE_SETUPTERM 1
- #cmakedefine HAVE_SIGSET 1
- #cmakedefine HAVE_SIGACTION 1

databases/mariadb/patches/patch-include_aligned_h

@@ -1,25 +0,0 @@
-Revert aligned_alloc() addition from MDEV-28836
-f02ca429f70c16be2b2e3d5671d9990cd3d474b6
-
-Index: include/aligned.h
---- include/aligned.h.orig
-+++ include/aligned.h
-@@ -14,8 +14,7 @@
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1335  USA */
- 
--#ifdef HAVE_ALIGNED_ALLOC
--#elif defined __linux__
-+#if defined __linux__
- # include <malloc.h>
- #endif
- 
-@@ -23,8 +22,6 @@ inline void *aligned_malloc(size_t size, size_t alignm
- {
- #ifdef _WIN32
-   return _aligned_malloc(size, alignment);
--#elif defined HAVE_ALIGNED_ALLOC
--  return aligned_alloc(alignment, size);
- #elif defined __linux__
-   return memalign(alignment, size);
- #else

databases/mariadb/patches/patch-plugin_disks_CMakeLists_txt

@@ -1,33 +0,0 @@
-MDEV-28592 disks plugin - getmntinfo (BSD) & getmntent (AIX)
-129616c70a69f5e0fe2f10bdd0e2785594305e44
-
-Index: plugin/disks/CMakeLists.txt
---- plugin/disks/CMakeLists.txt.orig
-+++ plugin/disks/CMakeLists.txt
-@@ -1,7 +1,24 @@
- INCLUDE (CheckIncludeFiles)
--CHECK_INCLUDE_FILES ("sys/statvfs.h;mntent.h" INFO_HEADERS LANGUAGE CXX)
- 
--IF (INFO_HEADERS)
-+CHECK_SYMBOL_EXISTS (getmntent "mntent.h" HAVE_GETMNTENT)
-+CHECK_SYMBOL_EXISTS (getmntent "sys/mnttab.h" HAVE_GETMNTENT_IN_SYS_MNTAB)
-+CHECK_SYMBOL_EXISTS (setmntent "mntent.h" HAVE_SETMNTENT)
-+CHECK_SYMBOL_EXISTS (getmntinfo "sys/types.h;sys/mount.h" HAVE_GETMNTINFO)
-+CHECK_SYMBOL_EXISTS (getmntinfo64 "sys/types.h;sys/mount.h" HAVE_GETMNTINFO64)
-+
-+IF (HAVE_GETMNTINFO)
-+CHECK_CXX_SOURCE_COMPILES("
-+#include <sys/types.h>
-+#include <sys/statvfs.h>
-+int main()
-+{
-+  struct statvfs *s;
-+  return getmntinfo(&s, ST_WAIT);
-+}
-+  " HAVE_GETMNTINFO_TAKES_statvfs)
-+ENDIF()
-+IF (HAVE_GETMNTENT OR HAVE_GETMNTENT_IN_SYS_MNTAB OR
-+    HAVE_GETMNTINFO OR HAVE_GETMNTINFO64)
-   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql)
-   MYSQL_ADD_PLUGIN(DISKS information_schema_disks.cc MODULE_ONLY RECOMPILE_FOR_EMBEDDED)
- ENDIF()

databases/mariadb/patches/patch-plugin_disks_information_schema_disks_cc

@@ -1,343 +0,0 @@
-MDEV-28592 disks plugin - getmntinfo (BSD) & getmntent (AIX)
-
-Thanks to references from Brad Smith, BSDs use getmntinfo as
-a system call for mounted filesystems.
-
-Most BSDs return statfs structures, (and we use OSX's statfs64),
-but NetBSD uses a statvfs structure.
-
-Simplify Linux getmntent_r to just use getmntent.
-
-AIX uses getmntent.
-
-An attempt at writing Solaris compatibility with
-a small bit of HPUX compatibility was made based on man page
-entries only. Fixes welcome.
-
-statvfs structures now use f_bsize for consistency with statfs
-
-Test case adjusted as PATH_MAX is OS defined (e.g. 1023 on AIX)
-
-Fixes: 0ee5cf837e3a0464acc20db2a2aee0adaff3f2ac
-
-also fixes:
-
-MDEV-27818: Disk plugin does not show zpool mounted devices
-
-This is because zpool mounted point don't begin with /.
-
-Due to the proliferation of multiple filesystem types since this
-was written, we restrict the entries listed in the disks plugin
-to excude:
-* read only mount points (no point monitoring, and
-  includes squash, snaps, sysfs, procfs, cgroups...)
-* mount points that aren't directories (excludes /etc/hostname and
-  similar mounts in containers). (getmntent (Linux/AIX) only)
-* exclude systems where there is no capacity listed (excludes various
-  virtual filesystem types).
-
-129616c70a69f5e0fe2f10bdd0e2785594305e44
-
-Index: plugin/disks/information_schema_disks.cc
---- plugin/disks/information_schema_disks.cc.orig
-+++ plugin/disks/information_schema_disks.cc
-@@ -17,11 +17,45 @@
- #include <my_global.h>
- #include <sys/statvfs.h>
- #include <sys/types.h>
-+#if defined(HAVE_GETMNTENT)
- #include <mntent.h>
-+#elif !defined(HAVE_GETMNTINFO_TAKES_statvfs)
-+/* getmntinfo (the not NetBSD variants) */
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
-+#endif
-+#if defined(HAVE_GETMNTENT_IN_SYS_MNTAB)
-+#include <sys/mnttab.h>
-+#define HAVE_GETMNTENT
-+#endif
- #include <sql_class.h>
- #include <sql_i_s.h>
- #include <sql_acl.h>                            /* check_global_access() */
- 
-+/*
-+  This intends to support *BSD's, macOS, Solaris, AIX, HP-UX, and Linux.
-+
-+  specificly:
-+  FreeBSD/OpenBSD/DragonFly (statfs) NetBSD (statvfs) uses getmntinfo().
-+  macOS uses getmntinfo64().
-+  Linux can use getmntent_r(), but we've just used getmntent for simplification.
-+  Linux/Solaris/AIX/HP-UX uses setmntent()/getmntent().
-+  Solaris uses getmntent() with a diffent prototype, return structure, and
-+    no setmntent(fopen instead)
-+*/
-+#if defined(HAVE_GETMNTINFO_TAKES_statvfs) || defined(HAVE_GETMNTENT)
-+typedef struct statvfs st_info;
-+#elif defined(HAVE_GETMNTINFO64)
-+typedef struct statfs64 st_info;
-+#else // GETMNTINFO
-+typedef struct statfs st_info;
-+#endif
-+#ifndef MOUNTED
-+/* HPUX - https://docstore.mik.ua/manuals/hp-ux/en/B2355-60130/getmntent.3X.html */
-+#define MOUNTED MNT_MNTTAB
-+#endif
-+
- bool schema_table_store_record(THD *thd, TABLE *table);
- 
- 
-@@ -42,24 +76,41 @@ ST_FIELD_INFO disks_table_fields[]=
- 
- 
- 
--int disks_table_add_row(THD* pThd,
--                        TABLE* pTable,
--                        const char* zDisk,
--                        const char* zPath,
--                        const struct statvfs& info)
-+static int disks_table_add_row_stat(
-+                                    THD* pThd,
-+                                    TABLE* pTable,
-+                                    const char* zDisk,
-+                                    const char* zPath,
-+                                    const st_info &info)
- {
-     // From: http://pubs.opengroup.org/onlinepubs/009695399/basedefs/sys/statvfs.h.html
-+    // and same for statfs:
-+    // From: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/statfs.2.html#//apple_ref/doc/man/2/statfs
-+    // and: https://www.freebsd.org/cgi/man.cgi?query=statfs&sektion=2&apropos=0&manpath=FreeBSD+13.1-RELEASE+and+Ports
-     //
--    // f_frsize   Fundamental file system block size.
-+    // f_bsize    Fundamental file system block size.
-     // f_blocks   Total number of blocks on file system in units of f_frsize.
-     // f_bfree    Total number of free blocks.
-     // f_bavail   Number of free blocks available to non-privileged process.
-+    ulong block_size= (ulong) info.f_bsize;
- 
--    ulonglong total = ((ulonglong)info.f_frsize * info.f_blocks) / 1024;
--    ulonglong used  = ((ulonglong)info.f_frsize *
-+    ulonglong total = ((ulonglong) block_size * info.f_blocks) / 1024;
-+    ulonglong used  = ((ulonglong) block_size *
-                             (info.f_blocks - info.f_bfree)) / 1024;
--    ulonglong avail = ((ulonglong)info.f_frsize * info.f_bavail) / 1024;
-+    ulonglong avail = ((ulonglong) block_size * info.f_bavail) / 1024;
- 
-+    /* skip filesystems that don't have any space */
-+    if (!info.f_blocks)
-+        return 0;
-+
-+    /* skip RO mounted filesystems */
-+#if defined(HAVE_GETMNTINFO_TAKES_statvfs) || defined(HAVE_GETMNTENT)
-+    if (info.f_flag & ST_RDONLY)
-+#else
-+    if (info.f_flags & MNT_RDONLY)
-+#endif
-+	return 0;
-+
-     pTable->field[0]->store(zDisk, strlen(zDisk), system_charset_info);
-     pTable->field[1]->store(zPath, strlen(zPath), system_charset_info);
-     pTable->field[2]->store(total);
-@@ -70,74 +121,150 @@ int disks_table_add_row(THD* pThd,
-     return (schema_table_store_record(pThd, pTable) != 0) ? 1 : 0;
- }
- 
--int disks_table_add_row(THD* pThd, TABLE* pTable, const char* zDisk, const char* zPath)
-+
-+#ifdef HAVE_GETMNTENT
-+static int disks_table_add_row(THD* pThd, TABLE* pTable, const char* zDisk, const char* zPath)
- {
-     int rv = 0;
- 
--    struct statvfs info;
-+    st_info info;
- 
-     if (statvfs(zPath, &info) == 0) // We ignore failures.
-     {
--        rv = disks_table_add_row(pThd, pTable, zDisk, zPath, info);
-+        rv = disks_table_add_row_stat(pThd, pTable, zDisk, zPath, info);
-     }
- 
-     return rv;
- }
-+#endif
- 
--int disks_fill_table(THD* pThd, TABLE_LIST* pTables, Item* pCond)
-+
-+#ifdef HAVE_GETMNTINFO
-+static int disks_fill_table(THD* pThd, TABLE_LIST* pTables, Item* pCond)
- {
--    int rv = 1;
--    TABLE* pTable = pTables->table;
-+    st_info *s;
-+    int count, rv= 0;
-+    TABLE* pTable= pTables->table;
- 
-     if (check_global_access(pThd, FILE_ACL, true))
--      return 0;
-+        return 0;
- 
--    FILE* pFile = setmntent("/etc/mtab", "r");
-+#if defined(HAVE_GETMNTINFO_TAKES_statvfs)
-+    count= getmntinfo(&s, ST_WAIT);
-+#elif defined(HAVE_GETMNTINFO64)
-+    count= getmntinfo64(&s, MNT_WAIT);
-+#else
-+    count= getmntinfo(&s, MNT_WAIT);
-+#endif
-+    if (count == 0)
-+        return 1;
- 
--    if (pFile)
-+    while (count && rv == 0)
-     {
--        const size_t BUFFER_SIZE = 4096; // 4K should be sufficient.
-+        rv= disks_table_add_row_stat(pThd, pTable, s->f_mntfromname, s->f_mntonname, *s);
-+        count--;
-+        s++;
-+    }
-+    return rv;
-+}
-+#else /* HAVE_GETMNTINFO */
- 
--        char* pBuffer = new (std::nothrow) char [BUFFER_SIZE];
-+static mysql_mutex_t m_getmntent;
- 
--        if (pBuffer)
--        {
--            rv = 0;
-+/* HAVE_GETMNTENT */
-+static int disks_fill_table(THD* pThd, TABLE_LIST* pTables, Item* pCond)
-+{
-+    int rv= 1;
-+#ifdef HAVE_SETMNTENT
-+    struct mntent* pEnt;
-+#else
-+    struct mnttab mnttabent, *pEnt= &mnttabent;
-+#endif
-+    FILE* pFile;
-+    TABLE* pTable= pTables->table;
- 
--            struct mntent ent;
--            struct mntent* pEnt;
-+    if (check_global_access(pThd, FILE_ACL, true))
-+        return 0;
- 
--            while ((rv == 0) && (pEnt = getmntent_r(pFile, &ent, pBuffer, BUFFER_SIZE)))
--            {
--                // We only report the ones that refer to physical disks.
--                if (pEnt->mnt_fsname[0] == '/')
--                {
--                    rv = disks_table_add_row(pThd, pTable, pEnt->mnt_fsname, pEnt->mnt_dir);
--                }
--            }
-+#ifdef HAVE_SETMNTENT
-+    pFile= setmntent(MOUNTED, "r");
-+#else
-+    /* Solaris */
-+    pFile= fopen("/etc/mnttab", "r");
-+#endif
- 
--            delete [] pBuffer;
--        }
--        else
--        {
--            rv = 1;
--        }
-+    if (!pFile)
-+        return 1;
- 
--        endmntent(pFile);
-+    rv= 0;
-+
-+    /*
-+      We lock the outer loop rather than between getmntent so the multiple
-+      infomation_schema.disks reads don't all start blocking each other and
-+      no-one gets any answers.
-+    */
-+    mysql_mutex_lock(&m_getmntent);
-+
-+    while ((rv == 0) &&
-+#if defined(HAVE_SETMNTENT)
-+        (pEnt = getmntent(pFile))
-+
-+#else
-+        getmntent(pFile, pEnt) != 0
-+#endif
-+        )
-+    {
-+        struct stat f;
-+	const char *path, *point;
-+#ifdef HAVE_SETMNTENT
-+	path= pEnt->mnt_dir;
-+	point= pEnt->mnt_fsname;
-+#else
-+	path= pEnt->mnt_mountp;
-+	point= pEnt->mnt_special;
-+#endif
-+	// Try to keep to real storage by excluding
-+        // read only mounts, and mount points that aren't directories
-+        if (hasmntopt(pEnt, MNTOPT_RO) != NULL)
-+            continue;
-+        if (stat(path, &f))
-+            continue;
-+        if (!S_ISDIR(f.st_mode))
-+            continue;
-+        rv= disks_table_add_row(pThd, pTable, point, path);
-     }
-+    mysql_mutex_unlock(&m_getmntent);
- 
-+#ifdef HAVE_SETMNTENT
-+    endmntent(pFile);
-+#else
-+    fclose(pFile);
-+#endif
-+
-     return rv;
- }
-+#endif /* HAVE_GETMNTINFO */
- 
--int disks_table_init(void *ptr)
-+static int disks_table_init(void *ptr)
- {
-     ST_SCHEMA_TABLE* pSchema_table = (ST_SCHEMA_TABLE*)ptr;
- 
-     pSchema_table->fields_info = disks_table_fields;
-     pSchema_table->fill_table = disks_fill_table;
-+#ifndef HAVE_GETMNTINFO
-+    mysql_mutex_init(0, &m_getmntent, MY_MUTEX_INIT_SLOW);
-+#endif
-     return 0;
- }
- 
-+static int disks_table_deinit(void *ptr __attribute__((unused)))
-+{
-+#ifndef HAVE_GETMNTINFO
-+    mysql_mutex_destroy(&m_getmntent);
-+#endif
-+    return 0;
-+}
-+
- } // namespace Show
- 
- extern "C"
-@@ -148,15 +275,15 @@ maria_declare_plugin(disks)
-     MYSQL_INFORMATION_SCHEMA_PLUGIN,
-     &disks_table_info,                 /* type-specific descriptor */
-     "DISKS",                           /* table name */
--    "Johan Wikman",                    /* author */
-+    "Johan Wikman, Daniel Black",      /* author */
-     "Disk space information",          /* description */
-     PLUGIN_LICENSE_GPL,                /* license type */
-     Show::disks_table_init,            /* init function */
--    NULL,                              /* deinit function */
--    0x0101,                            /* version = 1.1 */
-+    Show::disks_table_deinit,          /* deinit function */
-+    0x0102,                            /* version = 1.1 */
-     NULL,                              /* no status variables */
-     NULL,                              /* no system variables */
--    "1.1",                             /* String version representation */
-+    "1.2",                             /* String version representation */
-     MariaDB_PLUGIN_MATURITY_STABLE     /* Maturity (see include/mysql/plugin.h)*/
- }
- mysql_declare_plugin_end;

databases/mariadb/patches/patch-storage_innobase_buf_buf0flu_cc

@@ -1,26 +0,0 @@
-Revert aligned_alloc() addition from MDEV-28836
-f02ca429f70c16be2b2e3d5671d9990cd3d474b6
-
-Index: storage/innobase/buf/buf0flu.cc
---- storage/innobase/buf/buf0flu.cc.orig
-+++ storage/innobase/buf/buf0flu.cc
-@@ -544,19 +544,9 @@ static void buf_tmp_reserve_compression_buf(buf_tmp_bu
-   buffer be bigger than input buffer. Adjust the allocated size. */
-   ulint size= srv_page_size;
-   if (provider_service_lzo->is_loaded)
--  {
-     size= LZO1X_1_15_MEM_COMPRESS;
--#ifdef HAVE_ALIGNED_ALLOC
--    size= MY_ALIGN(size, srv_page_size);
--#endif
--  }
-   else if (provider_service_snappy->is_loaded)
--  {
-     size= snappy_max_compressed_length(size);
--#ifdef HAVE_ALIGNED_ALLOC
--    size= MY_ALIGN(size, srv_page_size);
--#endif
--  }
-   slot->comp_buf= static_cast<byte*>(aligned_malloc(size, srv_page_size));
- }
- 

databases/mariadb/pkg/PLIST-server

@@ -217,6 +217,7 @@ include/mysql/server/private/json_table.h
 include/mysql/server/private/key.h
 include/mysql/server/private/keycaches.h
 include/mysql/server/private/lex.h
+include/mysql/server/private/lex_charset.h
 include/mysql/server/private/lex_string.h
 include/mysql/server/private/lex_symbol.h
 include/mysql/server/private/lf.h
@@ -460,11 +461,13 @@ include/mysql/server/private/wsrep_high_priority_service.h
 include/mysql/server/private/wsrep_mutex.h
 include/mysql/server/private/wsrep_mysqld.h
 include/mysql/server/private/wsrep_mysqld_c.h
+include/mysql/server/private/wsrep_on.h
 include/mysql/server/private/wsrep_priv.h
 include/mysql/server/private/wsrep_schema.h
 include/mysql/server/private/wsrep_server_service.h
 include/mysql/server/private/wsrep_server_state.h
 include/mysql/server/private/wsrep_sst.h
+include/mysql/server/private/wsrep_status.h
 include/mysql/server/private/wsrep_storage_service.h
 include/mysql/server/private/wsrep_thd.h
 include/mysql/server/private/wsrep_trans_observer.h
@@ -504,6 +507,7 @@ lib/mysql/plugin/daemon_example.ini
 @so lib/mysql/plugin/ha_spider.so
 @so lib/mysql/plugin/ha_test_sql_discovery.so
 @so lib/mysql/plugin/handlersocket.so
+@so lib/mysql/plugin/hashicorp_key_management.so
 @so lib/mysql/plugin/libdaemon_example.so
 @so lib/mysql/plugin/locales.so
 @so lib/mysql/plugin/metadata_lock_info.so
@@ -581,6 +585,7 @@ share/doc/mysql/INSTALL-BINARY
 share/doc/mysql/README-wsrep
 share/doc/mysql/README.md
 share/doc/mysql/THIRDPARTY
+share/doc/mysql/hashicorp_key_management.txt
 share/doc/pkg-readmes/${PKGSTEM}
 share/examples/login.conf.d/mysqld
 @sample ${SYSCONFDIR}/login.conf.d/mysqld

databases/mariadb/pkg/PLIST-tests

@@ -1047,6 +1047,14 @@ share/mysql-test/main/ctype_binary.result
 share/mysql-test/main/ctype_binary.test
 share/mysql-test/main/ctype_collate.result
 share/mysql-test/main/ctype_collate.test
+share/mysql-test/main/ctype_collate_column.result
+share/mysql-test/main/ctype_collate_column.test
+share/mysql-test/main/ctype_collate_context.result
+share/mysql-test/main/ctype_collate_context.test
+share/mysql-test/main/ctype_collate_database.result
+share/mysql-test/main/ctype_collate_database.test
+share/mysql-test/main/ctype_collate_table.result
+share/mysql-test/main/ctype_collate_table.test
 share/mysql-test/main/ctype_cp1250_ch.result
 share/mysql-test/main/ctype_cp1250_ch.test
 share/mysql-test/main/ctype_cp1251.result
@@ -2138,6 +2146,8 @@ 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-order-by-size.result
+share/mysql-test/main/mysqldump-order-by-size.test
 share/mysql-test/main/mysqldump-system,win.rdiff
 share/mysql-test/main/mysqldump-system.result
 share/mysql-test/main/mysqldump-system.test
@@ -2617,6 +2627,10 @@ share/mysql-test/main/set_statement_profiling.result
 share/mysql-test/main/set_statement_profiling.test
 share/mysql-test/main/show.result
 share/mysql-test/main/show.test
+share/mysql-test/main/show_analyze.result
+share/mysql-test/main/show_analyze.test
+share/mysql-test/main/show_analyze_json.result
+share/mysql-test/main/show_analyze_json.test
 share/mysql-test/main/show_bad_definer-5553.result
 share/mysql-test/main/show_bad_definer-5553.test
 share/mysql-test/main/show_check-master.opt
@@ -2627,6 +2641,8 @@ share/mysql-test/main/show_create_user.test
 share/mysql-test/main/show_explain.opt
 share/mysql-test/main/show_explain.result
 share/mysql-test/main/show_explain.test
+share/mysql-test/main/show_explain_json.result
+share/mysql-test/main/show_explain_json.test
 share/mysql-test/main/show_explain_non_select.result
 share/mysql-test/main/show_explain_non_select.test
 share/mysql-test/main/show_explain_ps.result
@@ -2639,9 +2655,9 @@ share/mysql-test/main/show_row_order-9226.result
 share/mysql-test/main/show_row_order-9226.test
 share/mysql-test/main/shutdown.result
 share/mysql-test/main/shutdown.test
-share/mysql-test/main/shutdown_not_windows.combinations
-share/mysql-test/main/shutdown_not_windows.result
-share/mysql-test/main/shutdown_not_windows.test
+share/mysql-test/main/shutdown_debug.combinations
+share/mysql-test/main/shutdown_debug.result
+share/mysql-test/main/shutdown_debug.test
 share/mysql-test/main/sighup-6580.result
 share/mysql-test/main/sighup-6580.test
 share/mysql-test/main/signal.result
@@ -3561,6 +3577,37 @@ share/mysql-test/plugin/func_test/func_test/func_test.result
 share/mysql-test/plugin/func_test/func_test/func_test.test
 share/mysql-test/plugin/func_test/func_test/suite.opt
 share/mysql-test/plugin/func_test/func_test/suite.pm
+share/mysql-test/plugin/hashicorp_key_management/
+share/mysql-test/plugin/hashicorp_key_management/vault/
+share/mysql-test/plugin/hashicorp_key_management/vault/include/
+share/mysql-test/plugin/hashicorp_key_management/vault/include/have_hashicorp_key_management_plugin.inc
+share/mysql-test/plugin/hashicorp_key_management/vault/include/have_hashicorp_key_management_plugin.opt
+share/mysql-test/plugin/hashicorp_key_management/vault/include/have_mariabackup.inc
+share/mysql-test/plugin/hashicorp_key_management/vault/r/
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_cache_after_recreate.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_cache_timeout_update.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_check_kv_version.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_encode.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_key_migration.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_key_rotation_age.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_mariabackup.result
+share/mysql-test/plugin/hashicorp_key_management/vault/r/hashicorp_url_prefix.result
+share/mysql-test/plugin/hashicorp_key_management/vault/suite.pm
+share/mysql-test/plugin/hashicorp_key_management/vault/t/
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_cache_after_recreate.opt
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_cache_after_recreate.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_cache_timeout_update.opt
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_cache_timeout_update.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_check_kv_version.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_deinit.inc
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_encode.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_init.inc
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_key_migration.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_key_rotation_age.opt
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_key_rotation_age.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_mariabackup.test
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_plugin.inc
+share/mysql-test/plugin/hashicorp_key_management/vault/t/hashicorp_url_prefix.test
 share/mysql-test/plugin/heap/
 share/mysql-test/plugin/heap/mtr2/
 share/mysql-test/plugin/heap/mtr2/README
@@ -3968,10 +4015,12 @@ share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26158.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26539.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26544.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26582.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27172.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27184.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27239.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27240.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28854.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29008.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29011.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
@@ -4051,6 +4100,8 @@ share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26544.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26544.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26582.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26582.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27172.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27172.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27184.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27184.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27239.cnf
@@ -4059,6 +4110,8 @@ share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27240.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27240.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28854.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28854.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29008.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29008.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29011.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29011.test
 share/mysql-test/plugin/spider/spider/bugfix/t/quick_mode_0.cnf
@@ -4320,190 +4373,6 @@ share/mysql-test/plugin/spider/spider/include/quick_mode_3_init.inc
 share/mysql-test/plugin/spider/spider/include/slave_trx_isolation_deinit.inc
 share/mysql-test/plugin/spider/spider/include/slave_trx_isolation_init.inc
 share/mysql-test/plugin/spider/spider/my.cnf
-share/mysql-test/plugin/spider/spider/oracle/
-share/mysql-test/plugin/spider/spider/oracle/include/
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/deinit_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/ha_init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/hs_init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle/include/init_spider.inc
-share/mysql-test/plugin/spider/spider/oracle/my.cnf
-share/mysql-test/plugin/spider/spider/oracle/r/
-share/mysql-test/plugin/spider/spider/oracle/r/basic_sql.result
-share/mysql-test/plugin/spider/spider/oracle/r/basic_sql_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/direct_aggregate.result
-share/mysql-test/plugin/spider/spider/oracle/r/direct_aggregate_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/direct_update.result
-share/mysql-test/plugin/spider/spider/oracle/r/direct_update_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/function.result
-share/mysql-test/plugin/spider/spider/oracle/r/ha.result
-share/mysql-test/plugin/spider/spider/oracle/r/ha_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/spider3_fixes.result
-share/mysql-test/plugin/spider/spider/oracle/r/spider3_fixes_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/spider_fixes.result
-share/mysql-test/plugin/spider/spider/oracle/r/spider_fixes_part.result
-share/mysql-test/plugin/spider/spider/oracle/r/vp_fixes.result
-share/mysql-test/plugin/spider/spider/oracle/t/
-share/mysql-test/plugin/spider/spider/oracle/t/basic_sql.test
-share/mysql-test/plugin/spider/spider/oracle/t/basic_sql_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle/t/connect_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle/t/direct_aggregate.test
-share/mysql-test/plugin/spider/spider/oracle/t/direct_aggregate_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/direct_update.test
-share/mysql-test/plugin/spider/spider/oracle/t/direct_update_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/function.test
-share/mysql-test/plugin/spider/spider/oracle/t/ha.test
-share/mysql-test/plugin/spider/spider/oracle/t/ha_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/ha_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle/t/ha_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle/t/have_engine.inc
-share/mysql-test/plugin/spider/spider/oracle/t/have_func.inc
-share/mysql-test/plugin/spider/spider/oracle/t/have_partition.inc
-share/mysql-test/plugin/spider/spider/oracle/t/have_trigger.inc
-share/mysql-test/plugin/spider/spider/oracle/t/hs_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle/t/hs_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle/t/slave_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle/t/slave_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle/t/spider3_fixes.test
-share/mysql-test/plugin/spider/spider/oracle/t/spider3_fixes_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/spider_fixes.test
-share/mysql-test/plugin/spider/spider/oracle/t/spider_fixes_part.test
-share/mysql-test/plugin/spider/spider/oracle/t/test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle/t/test_init.inc
-share/mysql-test/plugin/spider/spider/oracle/t/vp_fixes.test
-share/mysql-test/plugin/spider/spider/oracle2/
-share/mysql-test/plugin/spider/spider/oracle2/include/
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/deinit_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/ha_init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/hs_init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/include/init_spider.inc
-share/mysql-test/plugin/spider/spider/oracle2/my.cnf
-share/mysql-test/plugin/spider/spider/oracle2/r/
-share/mysql-test/plugin/spider/spider/oracle2/r/basic_sql.result
-share/mysql-test/plugin/spider/spider/oracle2/r/basic_sql_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/direct_aggregate.result
-share/mysql-test/plugin/spider/spider/oracle2/r/direct_aggregate_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/direct_update.result
-share/mysql-test/plugin/spider/spider/oracle2/r/direct_update_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/function.result
-share/mysql-test/plugin/spider/spider/oracle2/r/ha.result
-share/mysql-test/plugin/spider/spider/oracle2/r/ha_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/spider3_fixes.result
-share/mysql-test/plugin/spider/spider/oracle2/r/spider3_fixes_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/spider_fixes.result
-share/mysql-test/plugin/spider/spider/oracle2/r/spider_fixes_part.result
-share/mysql-test/plugin/spider/spider/oracle2/r/vp_fixes.result
-share/mysql-test/plugin/spider/spider/oracle2/t/
-share/mysql-test/plugin/spider/spider/oracle2/t/basic_sql.test
-share/mysql-test/plugin/spider/spider/oracle2/t/basic_sql_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child2_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child2_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child2_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child3_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child3_2.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_child3_3.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_master_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/connect_slave1_1.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/direct_aggregate.test
-share/mysql-test/plugin/spider/spider/oracle2/t/direct_aggregate_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/direct_update.test
-share/mysql-test/plugin/spider/spider/oracle2/t/direct_update_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/function.test
-share/mysql-test/plugin/spider/spider/oracle2/t/ha.test
-share/mysql-test/plugin/spider/spider/oracle2/t/ha_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/ha_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/ha_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/have_engine.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/have_func.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/have_partition.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/have_trigger.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/hs_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/hs_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/slave_test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/slave_test_init.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/spider3_fixes.test
-share/mysql-test/plugin/spider/spider/oracle2/t/spider3_fixes_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/spider_fixes.test
-share/mysql-test/plugin/spider/spider/oracle2/t/spider_fixes_part.test
-share/mysql-test/plugin/spider/spider/oracle2/t/test_deinit.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/test_init.inc
-share/mysql-test/plugin/spider/spider/oracle2/t/vp_fixes.test
 share/mysql-test/plugin/spider/spider/r/
 share/mysql-test/plugin/spider/spider/r/auto_increment.result
 share/mysql-test/plugin/spider/spider/r/basic_sql.result
@@ -5407,6 +5276,7 @@ share/mysql-test/suite/binlog/r/binlog_mixed_load_data.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog-cp932.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog2.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_base64.result
+share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_do_server_ids.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_glle_ordered.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_gtid_strict_mode.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_gtid_window.result
@@ -5567,6 +5437,7 @@ share/mysql-test/suite/binlog/t/binlog_mysqlbinlog-cp932.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog2-master.opt
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog2.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_base64.test
+share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_do_server_ids.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_glle_ordered.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_gtid_strict_mode.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_gtid_window.test
@@ -9221,6 +9092,7 @@ 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,ON.rdiff
 share/mysql-test/suite/innodb/r/deadlock_detect.result
+share/mysql-test/suite/innodb/r/deadlock_victim_race.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
@@ -9501,6 +9373,7 @@ share/mysql-test/suite/innodb/r/log_data_file_size.result
 share/mysql-test/suite/innodb/r/log_file.result
 share/mysql-test/suite/innodb/r/log_file_name.result
 share/mysql-test/suite/innodb/r/log_file_size.result
+share/mysql-test/suite/innodb/r/log_file_size_online.result
 share/mysql-test/suite/innodb/r/max_record_size,16k,compact,innodb.rdiff
 share/mysql-test/suite/innodb/r/max_record_size,16k,dynamic,innodb.rdiff
 share/mysql-test/suite/innodb/r/max_record_size,16k,innodb,redundant.rdiff
@@ -9655,6 +9528,7 @@ share/mysql-test/suite/innodb/t/data_types.test
 share/mysql-test/suite/innodb/t/ddl_purge.test
 share/mysql-test/suite/innodb/t/deadlock_detect.combinations
 share/mysql-test/suite/innodb/t/deadlock_detect.test
+share/mysql-test/suite/innodb/t/deadlock_victim_race.test
 share/mysql-test/suite/innodb/t/default_row_format_alter.test
 share/mysql-test/suite/innodb/t/default_row_format_compatibility.test
 share/mysql-test/suite/innodb/t/default_row_format_create.test
@@ -9998,6 +9872,8 @@ share/mysql-test/suite/innodb/t/log_data_file_size.test
 share/mysql-test/suite/innodb/t/log_file.test
 share/mysql-test/suite/innodb/t/log_file_name.test
 share/mysql-test/suite/innodb/t/log_file_size.test
+share/mysql-test/suite/innodb/t/log_file_size_online.combinations
+share/mysql-test/suite/innodb/t/log_file_size_online.test
 share/mysql-test/suite/innodb/t/max_record_size.test
 share/mysql-test/suite/innodb/t/mdev-117.test
 share/mysql-test/suite/innodb/t/mdev-14846.opt
@@ -12909,6 +12785,7 @@ share/mysql-test/suite/rpl/include/create_recursive_construct.inc
 share/mysql-test/suite/rpl/include/delayed_slave_wait_on_query.inc
 share/mysql-test/suite/rpl/include/hrtime.inc
 share/mysql-test/suite/rpl/include/multisource.inc
+share/mysql-test/suite/rpl/include/mysqlbinlog_slave_consistency.inc
 share/mysql-test/suite/rpl/include/rpl_EE_err.test
 share/mysql-test/suite/rpl/include/rpl_auto_increment.test
 share/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test
@@ -12920,6 +12797,7 @@ share/mysql-test/suite/rpl/include/rpl_blackhole.test
 share/mysql-test/suite/rpl/include/rpl_blackhole_basic.test
 share/mysql-test/suite/rpl/include/rpl_cant_read_event_incident.inc
 share/mysql-test/suite/rpl/include/rpl_charset.test
+share/mysql-test/suite/rpl/include/rpl_check_table_consistency.inc
 share/mysql-test/suite/rpl/include/rpl_checksum.inc
 share/mysql-test/suite/rpl/include/rpl_checksum_cache.inc
 share/mysql-test/suite/rpl/include/rpl_commit_after_flush.test
@@ -12970,6 +12848,7 @@ share/mysql-test/suite/rpl/include/rpl_multi_update2.test
 share/mysql-test/suite/rpl/include/rpl_multi_update3.test
 share/mysql-test/suite/rpl/include/rpl_not_null.test
 share/mysql-test/suite/rpl/include/rpl_packet.inc
+share/mysql-test/suite/rpl/include/rpl_parallel_29322.inc
 share/mysql-test/suite/rpl/include/rpl_parallel_analyze_table_hang.inc
 share/mysql-test/suite/rpl/include/rpl_parallel_deadlock_corrupt_binlog.inc
 share/mysql-test/suite/rpl/include/rpl_parallel_domain.inc
@@ -13043,6 +12922,8 @@ share/mysql-test/suite/rpl/include/rpl_truncate.test
 share/mysql-test/suite/rpl/include/rpl_truncate_helper.test
 share/mysql-test/suite/rpl/include/rpl_typeconv.inc
 share/mysql-test/suite/rpl/include/rpl_xa_mixed_engines.inc
+share/mysql-test/suite/rpl/include/sql_multisource.inc
+share/mysql-test/suite/rpl/include/sql_out_of_order_gtid.inc
 share/mysql-test/suite/rpl/include/start_alter_basic.inc
 share/mysql-test/suite/rpl/include/start_alter_concurrent.inc
 share/mysql-test/suite/rpl/include/start_alter_include.inc
@@ -13177,6 +13058,8 @@ share/mysql-test/suite/rpl/r/rpl_extra_col_slave_myisam.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_revoke_missing_user.result
+share/mysql-test/suite/rpl/r/rpl_filter_set_var_missing_data.result
 share/mysql-test/suite/rpl/r/rpl_filter_tables_dynamic.result
 share/mysql-test/suite/rpl/r/rpl_filter_tables_not_exist.result
 share/mysql-test/suite/rpl/r/rpl_filter_wild_tables_dynamic.result
@@ -13298,6 +13181,7 @@ share/mysql-test/suite/rpl/r/rpl_mysql57_stm_temporal_round.result
 share/mysql-test/suite/rpl/r/rpl_mysql80_stm_temporal_round.result
 share/mysql-test/suite/rpl/r/rpl_mysql_manager_race_condition.result
 share/mysql-test/suite/rpl/r/rpl_mysql_upgrade.result
+share/mysql-test/suite/rpl/r/rpl_mysqlbinlog_slave_consistency.result
 share/mysql-test/suite/rpl/r/rpl_name_const.result
 share/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
 share/mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
@@ -13311,6 +13195,7 @@ share/mysql-test/suite/rpl/r/rpl_old_master_29078.result
 share/mysql-test/suite/rpl/r/rpl_optimize.result
 share/mysql-test/suite/rpl/r/rpl_packet.result
 share/mysql-test/suite/rpl/r/rpl_parallel2.result
+share/mysql-test/suite/rpl/r/rpl_parallel_29322.result
 share/mysql-test/suite/rpl/r/rpl_parallel_analyze_table_hang.result
 share/mysql-test/suite/rpl/r/rpl_parallel_charset.result
 share/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
@@ -13791,6 +13676,8 @@ share/mysql-test/suite/rpl/t/rpl_fail_register.test
 share/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt
 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_revoke_missing_user.test
+share/mysql-test/suite/rpl/t/rpl_filter_set_var_missing_data.test
 share/mysql-test/suite/rpl/t/rpl_filter_tables_dynamic.test
 share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist-slave.opt
 share/mysql-test/suite/rpl/t/rpl_filter_tables_not_exist.test
@@ -13963,6 +13850,7 @@ share/mysql-test/suite/rpl/t/rpl_mysql80_stm_temporal_round.test
 share/mysql-test/suite/rpl/t/rpl_mysql_manager_race_condition-slave.opt
 share/mysql-test/suite/rpl/t/rpl_mysql_manager_race_condition.test
 share/mysql-test/suite/rpl/t/rpl_mysql_upgrade.test
+share/mysql-test/suite/rpl/t/rpl_mysqlbinlog_slave_consistency.test
 share/mysql-test/suite/rpl/t/rpl_name_const.test
 share/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
 share/mysql-test/suite/rpl/t/rpl_non_direct_row_mixing_engines.test
@@ -13979,6 +13867,7 @@ share/mysql-test/suite/rpl/t/rpl_packet-master.opt
 share/mysql-test/suite/rpl/t/rpl_packet-slave.opt
 share/mysql-test/suite/rpl/t/rpl_packet.test
 share/mysql-test/suite/rpl/t/rpl_parallel2.test
+share/mysql-test/suite/rpl/t/rpl_parallel_29322.test
 share/mysql-test/suite/rpl/t/rpl_parallel_analyze_table_hang.test
 share/mysql-test/suite/rpl/t/rpl_parallel_charset.test
 share/mysql-test/suite/rpl/t/rpl_parallel_conflicts.test
@@ -16851,6 +16740,7 @@ share/mysql-test/suite/versioning/r/replace.result
 share/mysql-test/suite/versioning/r/rpl.result
 share/mysql-test/suite/versioning/r/rpl_mix.result
 share/mysql-test/suite/versioning/r/rpl_row.result
+share/mysql-test/suite/versioning/r/rpl_stmt.result
 share/mysql-test/suite/versioning/r/select,trx_id.rdiff
 share/mysql-test/suite/versioning/r/select.result
 share/mysql-test/suite/versioning/r/select2,trx_id.rdiff
@@ -16884,8 +16774,10 @@ share/mysql-test/suite/versioning/t/optimized.test
 share/mysql-test/suite/versioning/t/partition.test
 share/mysql-test/suite/versioning/t/replace.test
 share/mysql-test/suite/versioning/t/rpl.test
+share/mysql-test/suite/versioning/t/rpl_common.inc
 share/mysql-test/suite/versioning/t/rpl_mix.test
 share/mysql-test/suite/versioning/t/rpl_row.test
+share/mysql-test/suite/versioning/t/rpl_stmt.test
 share/mysql-test/suite/versioning/t/select.test
 share/mysql-test/suite/versioning/t/select2.test
 share/mysql-test/suite/versioning/t/simple.test