diff --git a/databases/mariadb/Makefile b/databases/mariadb/Makefile
index 31e7b526d..3d04a2e8a 100644
--- a/databases/mariadb/Makefile
+++ b/databases/mariadb/Makefile
@@ -2,16 +2,19 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)
 
-VERSION=	10.9.8
+VERSION=	11.4.4
 DISTNAME=	mariadb-${VERSION}
 PKGNAME-main=	mariadb-client-${VERSION}
-REVISION-server= 1
 EPOCH=		1
 CATEGORIES=	databases
 SITES=		https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
-		https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
+		https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ \
+		https://archive.mariadb.org/${DISTNAME}/source/
 
-LIB_VERSION=	30
+DISTFILES.fmt=	fmt-11.0.2.zip
+SITES.fmt=	https://github.com/fmtlib/fmt/releases/download/11.0.2/
+
+LIB_VERSION=	31
 SHARED_LIBS=	mysqlclient_r	${LIB_VERSION}.0 \
 		mysqlclient	${LIB_VERSION}.0 \
 		mariadb		${LIB_VERSION}.0
@@ -38,12 +41,13 @@ SOCKET_DIR=	/var/run/mysql
 SUBST_VARS=	SOCKET_DIR
 
 MODULES=	devel/cmake
-BUILD_DEPENDS=	devel/bison \
-		devel/fmt
+BUILD_DEPENDS=	devel/bison
 
 LIB_DEPENDS-main=	${LIB_DEPENDS}
-RUN_DEPENDS-server=	${BASE_PKGPATH},-main>=10.9v1,<10.10v1 \
-			databases/p5-DBD-MariaDB
+RUN_DEPENDS-server=	${BASE_PKGPATH},-main>=11.4v1,<11.5v1 \
+			databases/p5-DBD-MariaDB \
+			misc/findutils \
+			sysutils/coreutils
 LIB_DEPENDS-server=	${LIB_DEPENDS} \
 			archivers/bzip2 \
 			archivers/lz4 \
@@ -54,7 +58,7 @@ LIB_DEPENDS-server=	${LIB_DEPENDS} \
 			devel/pcre2 \
 			net/curl \
 			textproc/libxml
-RUN_DEPENDS-tests=	${BASE_PKGPATH},-main>=10.9v1,<10.10v1
+RUN_DEPENDS-tests=	${BASE_PKGPATH},-main>=11.4v1,<11.5v1
 LIB_DEPENDS-tests=	${LIB_DEPENDS} \
 			devel/pcre2
 
@@ -78,6 +82,7 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 		-DCOMPILATION_COMMENT='SecBSD port: ${FULLPKGNAME-server}' \
 		-DPLUGIN_OQGRAPH=NO \
 		-DWITH_EXTERNAL_ZLIB=On \
+		-DWITH_LIBFMT=bundled \
 		-DWITH_PCRE=system \
 		-DWITH_SSL=system \
 		-DWITH_WSREP=On \
@@ -127,6 +132,8 @@ PKG_ARGS+=	-Drocksdb=0
 .endif
 
 pre-configure:
+	mkdir -p ${WRKBUILD}/extra/libfmt/src
+	cp -f ${DISTDIR}/fmt-11.0.2.zip ${WRKBUILD}/extra/libfmt/src
 	@${SUBST_CMD} ${WRKSRC}/cmake/mysql_version.cmake \
 	    ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c.in \
 	    ${WRKSRC}/scripts/mysql_config.sh
diff --git a/databases/mariadb/distinfo b/databases/mariadb/distinfo
index 96e509c8f..f8aa56852 100644
--- a/databases/mariadb/distinfo
+++ b/databases/mariadb/distinfo
@@ -1,2 +1,4 @@
-SHA256 (mariadb-10.9.8.tar.gz) = /Nxvc4gkd8IDEOeVoC90blSTSqeos2iQC9ReeKXa9u0=
-SIZE (mariadb-10.9.8.tar.gz) = 99099072
+SHA256 (fmt-11.0.2.zip) = QPxYvrzzjHWeEae9j9wWNQfSQj71BYu6fyYoDFucVGU=
+SHA256 (mariadb-11.4.4.tar.gz) = lvvS5uk/t+izc+6nXYW2/qV8DhEaAgkMu+/tUlmdx3s=
+SIZE (fmt-11.0.2.zip) = 1422604
+SIZE (mariadb-11.4.4.tar.gz) = 111017581
diff --git a/databases/mariadb/patches/patch-cmake_install_macros_cmake b/databases/mariadb/patches/patch-cmake_install_macros_cmake
index b89a8cfbe..2ba881121 100644
--- a/databases/mariadb/patches/patch-cmake_install_macros_cmake
+++ b/databases/mariadb/patches/patch-cmake_install_macros_cmake
@@ -1,7 +1,7 @@
 Index: cmake/install_macros.cmake
 --- cmake/install_macros.cmake.orig
 +++ cmake/install_macros.cmake
-@@ -175,6 +175,36 @@ IF(UNIX)
+@@ -157,6 +157,36 @@ IF(UNIX)
  ENDIF()
  ENDMACRO()
  
diff --git a/databases/mariadb/patches/patch-cmake_libfmt_cmake b/databases/mariadb/patches/patch-cmake_libfmt_cmake
deleted file mode 100644
index 634446dcf..000000000
--- a/databases/mariadb/patches/patch-cmake_libfmt_cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-MDEV-31963 cmake: fix libfmt usage
-
-`fmt::detail::make_arg` does not accept temporaries, so the code snippet
-checking system libfmt needs to be adjusted.
-
-f4cec369a392c8a6056207012992ad4a5639965a
-
-Index: cmake/libfmt.cmake
---- cmake/libfmt.cmake.orig
-+++ cmake/libfmt.cmake
-@@ -33,8 +33,9 @@ MACRO (CHECK_LIBFMT)
-      #include <fmt/format-inl.h>
-      #include <iostream>
-      int main() {
-+       int answer= 42;
-        fmt::format_args::format_arg arg=
--         fmt::detail::make_arg<fmt::format_context>(42);
-+         fmt::detail::make_arg<fmt::format_context>(answer);
-          std::cout << fmt::vformat(\"The answer is {}.\",
-                                    fmt::format_args(&arg, 1));
-      }" HAVE_SYSTEM_LIBFMT)
diff --git a/databases/mariadb/patches/patch-extra_mariabackup_xtrabackup_cc b/databases/mariadb/patches/patch-extra_mariabackup_xtrabackup_cc
index 35831f06f..eeab9222d 100644
--- a/databases/mariadb/patches/patch-extra_mariabackup_xtrabackup_cc
+++ b/databases/mariadb/patches/patch-extra_mariabackup_xtrabackup_cc
@@ -1,12 +1,12 @@
 Index: extra/mariabackup/xtrabackup.cc
 --- extra/mariabackup/xtrabackup.cc.orig
 +++ extra/mariabackup/xtrabackup.cc
-@@ -7144,6 +7144,8 @@ static int get_exepath(char *buf, size_t size, const c
-   if (sysctl(mib, 4, buf, &size, NULL, 0) == 0) {
-     return 0;
+@@ -1061,6 +1061,8 @@ static std::string filename_to_spacename(const void *f
+     if (f[i] == '\\')
+       f[i] = '/';
    }
 +#elif defined(__OpenBSD__)
 +  return 0;
  #endif
  
-   return my_realpath(buf, argv0, 0);
+   /* Remove extension, if exists */
diff --git a/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt b/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt
index d44d9e125..98a0d4e6f 100644
--- a/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt
+++ b/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt
@@ -1,7 +1,7 @@
 Index: libmariadb/libmariadb/CMakeLists.txt
 --- libmariadb/libmariadb/CMakeLists.txt.orig
 +++ libmariadb/libmariadb/CMakeLists.txt
-@@ -481,15 +481,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
+@@ -487,15 +487,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
  # of the config program. To make sure these programs can
  # use mariadb client library we provide libmysql symlinks
  
diff --git a/databases/mariadb/patches/patch-scripts_mysql_install_db_sh b/databases/mariadb/patches/patch-scripts_mysql_install_db_sh
index 0aff9a993..49edbc332 100644
--- a/databases/mariadb/patches/patch-scripts_mysql_install_db_sh
+++ b/databases/mariadb/patches/patch-scripts_mysql_install_db_sh
@@ -1,7 +1,7 @@
 Index: scripts/mysql_install_db.sh
 --- scripts/mysql_install_db.sh.orig
 +++ scripts/mysql_install_db.sh
-@@ -30,8 +30,8 @@ args=""
+@@ -29,8 +29,8 @@ args=""
  defaults=""
  defaults_group_suffix=""
  mysqld_opt=""
@@ -10,43 +10,9 @@ Index: scripts/mysql_install_db.sh
 +user="_mysql"
 +group="_mysql"
  silent_startup="--silent-startup"
+ log_error=""
  
- force=0
-@@ -341,7 +341,6 @@ then
-   srcpkgdatadir="$srcdir/scripts"
-   buildpkgdatadir="$builddir/scripts"
-   plugindir="$builddir/plugin/auth_socket"
--  pamtooldir="$builddir/plugin/auth_pam"
- elif test -n "$basedir"
- then
-   bindir="$basedir/bin" # only used in the help text
-@@ -370,8 +369,7 @@ then
-     cannot_find_file fill_help_tables.sql @pkgdata_locations@
-     exit 1
-   fi
--  plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
--  pamtooldir=$plugindir
-+  plugindir=`find_in_dirs --dir auth_ed25519.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
- # relative from where the script was run for a relocatable install
- elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mariadbd"
- then
-@@ -382,7 +380,6 @@ then
-   srcpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
-   buildpkgdatadir="$basedir/@INSTALL_MYSQLSHAREDIR@"
-   plugindir="$basedir/@INSTALL_PLUGINDIR@"
--  pamtooldir=$plugindir
- else
-   basedir="@prefix@"
-   bindir="@bindir@"
-@@ -391,7 +388,6 @@ else
-   srcpkgdatadir="@pkgdatadir@"
-   buildpkgdatadir="@pkgdatadir@"
-   plugindir="@pkgplugindir@"
--  pamtooldir="@pkgplugindir@"
- fi
- 
- # Set up paths to SQL scripts required for bootstrap
-@@ -490,13 +486,13 @@ do
+@@ -482,13 +482,13 @@ do
    then
      if test -z "$group"
      then
@@ -63,33 +29,7 @@ Index: scripts/mysql_install_db.sh
        echo "user.  Check that you have the necessary permissions and try again."
        exit 1
      fi
-@@ -505,25 +501,6 @@ done
- 
- if test -n "$user"
- then
--  if test -z "$srcdir" -a "$in_rpm" -eq 0
--  then
--    chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
--    chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
--    if test $? -ne 0
--    then
--        echo "Couldn't set an owner to '$pamtooldir/auth_pam_tool_dir/auth_pam_tool'."
--        echo "It must be root, the PAM authentication plugin doesn't work otherwise.."
--        echo
--    fi
--    chown $user "$pamtooldir/auth_pam_tool_dir" && \
--    chmod 0700 "$pamtooldir/auth_pam_tool_dir"
--    if test $? -ne 0
--    then
--        echo "Cannot change ownership of the '$pamtooldir/auth_pam_tool_dir' directory"
--        echo "to the '$user' user. Check that you have the necessary permissions and try again."
--        echo
--    fi
--  fi
-   args="$args --user=$user"
- fi
- 
-@@ -641,10 +618,6 @@ fi
+@@ -652,10 +652,6 @@ fi
  # the screen.
  if test "$cross_bootstrap" -eq 0 && test -z "$srcdir"
  then
@@ -100,13 +40,13 @@ Index: scripts/mysql_install_db.sh
    if test "$auth_root_authentication_method" = normal
    then
      echo
-@@ -676,10 +649,7 @@ then
+@@ -687,10 +683,7 @@ then
    then
      echo
      echo "You can start the MariaDB daemon with:"
--    echo "cd '$basedir' ; $bindir/mariadb-safe --datadir='$ldata'"
+-    echo "cd '$basedir' ; $bindir/mariadbd-safe --datadir='$ldata'"
 -    echo
--    echo "You can test the MariaDB daemon with mysql-test-run.pl"
+-    echo "You can test the MariaDB daemon with mariadb-test-run.pl"
 -    echo "cd '$basedir/@INSTALL_MYSQLTESTDIR@' ; perl mariadb-test-run.pl"
 +    echo "/etc/rc.d/mysqld start"
    fi
diff --git a/databases/mariadb/patches/patch-scripts_mysqld_safe_sh b/databases/mariadb/patches/patch-scripts_mysqld_safe_sh
index 98966bd6a..6c41e7970 100644
--- a/databases/mariadb/patches/patch-scripts_mysqld_safe_sh
+++ b/databases/mariadb/patches/patch-scripts_mysqld_safe_sh
@@ -12,7 +12,7 @@ Index: scripts/mysqld_safe.sh
  pid_file=
  err_log=
  err_log_base=
-@@ -734,7 +734,7 @@ then
+@@ -740,7 +740,7 @@ then
      [ "$user" ] && chown $user $mysql_unix_port_dir
      [ "$group" ] && chgrp $group $mysql_unix_port_dir
    fi
diff --git a/databases/mariadb/patches/patch-scripts_wsrep_sst_common_sh b/databases/mariadb/patches/patch-scripts_wsrep_sst_common_sh
index 40884923d..c7fa642c3 100644
--- a/databases/mariadb/patches/patch-scripts_wsrep_sst_common_sh
+++ b/databases/mariadb/patches/patch-scripts_wsrep_sst_common_sh
@@ -1,56 +1,82 @@
 Index: scripts/wsrep_sst_common.sh
 --- scripts/wsrep_sst_common.sh.orig
 +++ scripts/wsrep_sst_common.sh
-@@ -23,6 +23,11 @@ trap 'exit 3'  INT QUIT TERM
- # Setting the path for some utilities on CentOS
- export PATH="$PATH:/usr/sbin:/usr/bin:/sbin:/bin"
+@@ -79,6 +79,16 @@ wsrep_log_info()
+     wsrep_log "[INFO] $*"
+ }
  
 +find()
 +{
 +    gfind "$@"
 +}
++
++du()
++{
++    gdu "$@"
++}
 +
  trim_string()
  {
      if [ -n "$BASH_VERSION" ]; then
-@@ -1166,9 +1171,9 @@ is_local_ip()
-     # the domain name check:
-     if [ "${2:-0}" -eq 0 ]; then
-        # We consider all the names of a given host to be local addresses:
--       [ "$1" = "$(hostname -s)" -o \
--         "$1" = "$(hostname -f)" -o \
--         "$1" = "$(hostname -d)" ] && return 0
-+       [ "$1" = "$(hostname -s 2>/dev/null)" -o \
-+         "$1" = "$(hostname -f 2>/dev/null)" -o \
-+         "$1" = "$(hostname -d 2>/dev/null)" ] && return 0
-     fi
-     # If the address contains anything other than digits
-     # and separators, it is not a local address:
-@@ -1199,14 +1204,17 @@ check_sockets_utils()
+@@ -1212,6 +1222,7 @@ check_sockets_utils()
      lsof_available=0
      sockstat_available=0
      ss_available=0
 +    fstat_available=0
  
-     [ -n "$(commandex lsof)" ] && lsof_available=1
-     [ -n "$(commandex sockstat)" ] && sockstat_available=1
-     [ -n "$(commandex ss)" ] && ss_available=1
-+    [ -n "$(commandex fstat)" ] && fstat_available=1
- 
-     if [ $lsof_available -eq 0 -a \
-          $sockstat_available -eq 0 -a \
--         $ss_available -eq 0 ]
-+         $ss_available -eq 0 -a \
-+         $fstat_available -eq 0 ]
-     then
-         wsrep_log_error "Neither lsof, nor sockstat or ss tool was found in" \
-                         "the PATH. Make sure you have it installed."
-@@ -1249,6 +1257,8 @@ check_port()
-     elif [ $ss_available -ne 0 ]; then
-         ss -nlpH "( sport = :$port )" 2>/dev/null | \
-         grep -q -E "users:\\(.*\\(\"($utils)[^[:space:]]*\"[^)]*,pid=$pid(,[^)]*)?\\)" && rc=0
+     socket_utility="$(commandex ss)"
+     if [ -n "$socket_utility" ]; then
+@@ -1236,23 +1247,30 @@ check_sockets_utils()
+                 sockstat_opts='-46lq -P tcp -p'
+             fi
+         else
+-            socket_utility="$(commandex lsof)"
++            socket_utility="$(commandex fstat)"
+             if [ -n "$socket_utility" ]; then
+-                socket_uname='lsof'
+-                lsof_available=1
+-                lsof_opts='-Pnl'
+-                # Let's check that lsof has an option to bypass blocking:
+-                if $socket_utility -h 2>&1 | grep -qw -F -- '-b'; then
+-                    lsof_available=2
+-                    lsof_opts="$lsof_opts -b -w"
++                socket_uname='fstat'
++                fstat_available=1
++                fstat_opts='-n'
++            else
++                socket_utility="$(commandex lsof)"
++                if [ -n "$socket_utility" ]; then
++                    socket_uname='lsof'
++                    lsof_available=1
++                    lsof_opts='-Pnl'
++                    # Let's check that lsof has an option to bypass blocking:
++                    if $socket_utility -h 2>&1 | grep -qw -F -- '-b'; then
++                        lsof_available=2
++                        lsof_opts="$lsof_opts -b -w"
++                    else
++                        lsof_opts="$lsof_opts -S 10"
++                    fi
+                 else
+-                    lsof_opts="$lsof_opts -S 10"
++                    wsrep_log_error "Neither lsof, nor sockstat, nor ss, nor fstat tool" \
++                                    "were found in the path. Make sure you have" \
++                                    "at least one of them installed."
++                    exit 2 # ENOENT
+                 fi
+-            else
+-                wsrep_log_error "Neither lsof, nor sockstat, nor ss tool" \
+-                                "were found in the path. Make sure you have" \
+-                                "at least one of them installed."
+-                exit 2 # ENOENT
+             fi
+         fi
+     fi
+@@ -1302,6 +1320,8 @@ check_port()
+             $socket_utility $sockstat_opts "$port" 2>/dev/null | \
+                 grep -q -E "^[^[:space:]]+[[:space:]]+($utils)[^[:space:]]*[[:space:]]+$pid([[:space:]].+)?[[:space:]]LISTEN([[:space:]]|\$)" && rc=0
+         fi
 +    elif [ $fstat_available -ne 0 ]; then
-+        fstat -n 2>/dev/null | grep -q -E ".*$pid.*:$port\$" && rc=0
-     else
-         wsrep_log_error "Unknown sockets utility"
-         exit 2 # ENOENT
++        $socket_utility $fstat_opts 2>/dev/null | grep -q -E ".*$pid.*:$port\$" && rc=0
+     elif [ $lsof_available -ne 0 ]; then
+         $socket_utility $lsof_opts -i ":$port" 2>/dev/null | \
+             grep -q -E "^($utils)[^[:space:]]*[[:space:]]+$pid([[:space:]].+)?[[:space:]]\\(LISTEN\\)([[:space:]]|\$)" && rc=0
diff --git a/databases/mariadb/patches/patch-scripts_wsrep_sst_mariabackup_sh b/databases/mariadb/patches/patch-scripts_wsrep_sst_mariabackup_sh
index 62379849a..2ab7cab69 100644
--- a/databases/mariadb/patches/patch-scripts_wsrep_sst_mariabackup_sh
+++ b/databases/mariadb/patches/patch-scripts_wsrep_sst_mariabackup_sh
@@ -1,7 +1,7 @@
 Index: scripts/wsrep_sst_mariabackup.sh
 --- scripts/wsrep_sst_mariabackup.sh.orig
 +++ scripts/wsrep_sst_mariabackup.sh
-@@ -101,6 +101,12 @@ if [ -z "$BACKUP_BIN" ]; then
+@@ -33,6 +33,18 @@ if [ -z "$BACKUP_BIN" ]; then
      exit 42
  fi
  
@@ -11,33 +11,12 @@ Index: scripts/wsrep_sst_mariabackup.sh
 +    exit 42
 +fi
 +
- DATA="$WSREP_SST_OPT_DATA"
- INFO_FILE='xtrabackup_galera_info'
- IST_FILE='xtrabackup_ist'
-@@ -441,7 +447,7 @@ get_footprint()
-     cd "$DATA_DIR"
-     local payload_data=$(find . \
-         -regex '.*undo[0-9]+$\|.*\.ibd$\|.*\.MYI$\|.*\.MYD$\|.*ibdata1$' \
--        -type f -print0 | du --files0-from=- --block-size=1 -c -s | \
-+        -type f -print0 | xargs -0 du -c -s | \
-         awk 'END { print $1 }')
-     local payload_undo=0
-     if [ -n "$ib_undo_dir" -a "$ib_undo_dir" != '.' -a \
-@@ -449,7 +455,7 @@ get_footprint()
-     then
-         cd "$ib_undo_dir"
-         payload_undo=$(find . -regex '.*undo[0-9]+$' -type f -print0 | \
--            du --files0-from=- --block-size=1 -c -s | awk 'END { print $1 }')
-+            xargs -0 du -c -s | awk 'END { print $1 }')
-     fi
-     cd "$OLD_PWD"
++GDU_BIN=$(commandex 'gdu')
++if [ -z "$GDU_BIN" ]; then
++    wsrep_log_error 'gdu binary not found in path'
++    exit 42
++fi
++
+ BACKUP_PID=""
  
-@@ -798,7 +804,7 @@ recv_joiner()
-     local ltcmd="$tcmd"
-     if [ $tmt -gt 0 ]; then
-         if [ -n "$(commandex timeout)" ]; then
--            if timeout --help | grep -qw -F -- '-k'; then
-+            if timeout --help 2>/dev/null | grep -qw -F -- '-k'; then
-                 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-             else
-                 ltcmd="timeout -s9 $tmt $tcmd"
+ INFO_FILE='mariadb_backup_galera_info'
diff --git a/databases/mariadb/patches/patch-scripts_wsrep_sst_rsync_sh b/databases/mariadb/patches/patch-scripts_wsrep_sst_rsync_sh
index b6ecb0ae8..7df20c898 100644
--- a/databases/mariadb/patches/patch-scripts_wsrep_sst_rsync_sh
+++ b/databases/mariadb/patches/patch-scripts_wsrep_sst_rsync_sh
@@ -1,40 +1,22 @@
 Index: scripts/wsrep_sst_rsync.sh
 --- scripts/wsrep_sst_rsync.sh.orig
 +++ scripts/wsrep_sst_rsync.sh
-@@ -117,9 +117,14 @@ check_pid_and_port()
-                 fi
-                 port_info=$(sockstat "$opts" "$port" 2>/dev/null | \
-                     grep -E '[[:space:]]LISTEN' | grep -o -E "$filter")
--            else
-+            elif [ $ss_available -ne 0 ]; then
-                 port_info=$(ss -nlpH "( sport = :$port )" 2>/dev/null | \
-                     grep -F 'users:(' | grep -o -E "$filter")
-+            elif [ $fstat_available -ne 0 ]; then
-+                port_info=$(fstat -n 2>/dev/null | grep -E "[[:space:]](\\*|\\[?::\\]?):$port\$")
+@@ -127,9 +127,15 @@ check_pid_and_port()
+             fi
+             final='$'
+         else
+-            port_info=$($socket_utility $lsof_opts -i ":$port" 2>/dev/null | \
+-                grep -w -F '(LISTEN)' || :)
+-            final='[[:space:]]'
++            if [ $fstat_available -ne 0 ]; then
++                port_info=$($socket_utility $fstat_opts 2>/dev/null | \
++                    grep -E "[[:space:]](\\*|\\[?::\\]?):$port\$")
++                final=''
 +            else
-+                wsrep_log_error "Unknown sockets utility"
-+                exit 2 # ENOENT
-             fi
-             echo "$port_info" | \
-             grep -q -E "[[:space:]](\\*|\\[?::\\]?):$port\$" && busy=1
-@@ -474,9 +479,9 @@ EOF
-                     # Preparing binlog files for transfer:
-                     wsrep_log_info "Preparing binlog files for transfer:"
-                     tar_type=0
--                    if tar --help | grep -qw -F -- '--transform'; then
-+                    if tar --help 2>/dev/null | grep -qw -F -- '--transform'; then
-                         tar_type=1
--                    elif tar --version | grep -qw -E '^bsdtar'; then
-+                    elif tar --version 2>/dev/null | grep -qw -E '^bsdtar'; then
-                         tar_type=2
-                     fi
-                     if [ $tar_type -eq 2 ]; then
-@@ -974,7 +979,7 @@ EOF
-             fi
-             # Extracting binlog files:
-             wsrep_log_info "Extracting binlog files:"
--            if tar --version | grep -qw -E '^bsdtar'; then
-+            if tar --version 2>/dev/null | grep -qw -E '^bsdtar'; then
-                 tar -tf "$BINLOG_TAR_FILE" > "$tmpfile" && \
-                 tar -xvf "$BINLOG_TAR_FILE" > /dev/null || RC=$?
-             else
++                port_info=$($socket_utility $lsof_opts -i ":$port" 2>/dev/null | \
++                    grep -w -F '(LISTEN)' || :)
++                final='[[:space:]]'
++            fi
+         fi
+ 
+         local busy=0
diff --git a/databases/mariadb/patches/patch-sql_item_strfunc_cc b/databases/mariadb/patches/patch-sql_item_strfunc_cc
deleted file mode 100644
index e26509feb..000000000
--- a/databases/mariadb/patches/patch-sql_item_strfunc_cc
+++ /dev/null
@@ -1,116 +0,0 @@
-- [PATCH] MDEV-31963 Fix libfmt usage in SFORMAT
-
-  `fmt::detail::make_arg` does not accept temporaries. Make it happy by
-  storing the format arg values in a temporary array first.
-
-  cd5808eb8da13c5626d4bdeb452cef6ada29cb1d
-
-- MDEV-34206 compile failure: fmt use incompatible with libfmt-10.2.[2]+
-
-  Upstream libfmt commit fmtlib/fmt@d707292
-  now requires the format function to be const.
-
-  Adjust the function prototype so it is const and can compile.
-
-  4375245d5d9f01cabb6e3fd6c637535e724eae38
-
-Index: sql/item_strfunc.cc
---- sql/item_strfunc.cc.orig
-+++ sql/item_strfunc.cc
-@@ -1367,7 +1367,7 @@ bool Item_func_sformat::fix_length_and_dec(THD *thd)
- namespace fmt {
-   template <> struct formatter<String>: formatter<string_view> {
-     template <typename FormatContext>
--    auto format(String c, FormatContext& ctx) -> decltype(ctx.out()) {
-+    auto format(String c, FormatContext& ctx) const -> decltype(ctx.out()) {
-       string_view name = { c.ptr(), c.length() };
-       return formatter<string_view>::format(name, ctx);
-     };
-@@ -1382,11 +1382,24 @@ namespace fmt {
- */
- String *Item_func_sformat::val_str(String *res)
- {
-+  /*
-+    A union that stores a numeric format arg value.
-+    fmt::detail::make_arg does not accept temporaries, so all of its numeric
-+    args are temporarily stored in the fmt_args array.
-+    See: https://github.com/fmtlib/fmt/issues/3596
-+  */
-+  union Format_arg_store {
-+    longlong val_int;
-+    float    val_float;
-+    double   val_double;
-+  };
-+
-   DBUG_ASSERT(fixed());
--  using                         ctx=     fmt::format_context;
--  String                       *fmt_arg= NULL;
--  String                       *parg=    NULL;
--  fmt::format_args::format_arg *vargs=   NULL;
-+  using                         ctx=      fmt::format_context;
-+  String                       *fmt_arg=  NULL;
-+  String                       *parg=     NULL;
-+  fmt::format_args::format_arg *vargs=    NULL;
-+  Format_arg_store             *fmt_args= NULL;
- 
-   null_value= true;
-   if (!(fmt_arg= args[0]->val_str(res)))
-@@ -1395,25 +1408,39 @@ String *Item_func_sformat::val_str(String *res)
-   if (!(vargs= new fmt::format_args::format_arg[arg_count - 1]))
-     return NULL;
- 
-+  if (!(fmt_args= new Format_arg_store[arg_count - 1]))
-+  {
-+    delete [] vargs;
-+    return NULL;
-+  }
-+
-   /* Creates the array of arguments for vformat */
-   for (uint carg= 1; carg < arg_count; carg++)
-   {
-     switch (args[carg]->result_type())
-     {
-     case INT_RESULT:
--      vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int());
-+      fmt_args[carg-1].val_int= args[carg]->val_int();
-+      vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_int);
-       break;
-     case DECIMAL_RESULT: // TODO
-     case REAL_RESULT:
-       if (args[carg]->field_type() == MYSQL_TYPE_FLOAT)
--        vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real());
-+      {
-+        fmt_args[carg-1].val_float= (float)args[carg]->val_real();
-+        vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_float);
-+      }
-       else
--        vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real());
-+      {
-+        fmt_args[carg-1].val_double= args[carg]->val_real();
-+        vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_double);
-+      }
-       break;
-     case STRING_RESULT:
-       if (!(parg= args[carg]->val_str(&val_arg[carg-1])))
-       {
-         delete [] vargs;
-+        delete [] fmt_args;
-         return NULL;
-       }
-       vargs[carg-1]= fmt::detail::make_arg<ctx>(*parg);
-@@ -1423,6 +1450,7 @@ String *Item_func_sformat::val_str(String *res)
-     default:
-       DBUG_ASSERT(0);
-       delete [] vargs;
-+      delete [] fmt_args;
-       return NULL;
-     }
-   }
-@@ -1446,6 +1474,7 @@ String *Item_func_sformat::val_str(String *res)
-     null_value= true;
-   }
-   delete [] vargs;
-+  delete [] fmt_args;
-   return null_value ? NULL : res;
- }
- 
diff --git a/databases/mariadb/patches/patch-storage_connect_libdoc_cpp b/databases/mariadb/patches/patch-storage_connect_libdoc_cpp
deleted file mode 100644
index 09a616f08..000000000
--- a/databases/mariadb/patches/patch-storage_connect_libdoc_cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-Unbreak build with libxml >=2.12.0
-
-Index: storage/connect/libdoc.cpp
---- storage/connect/libdoc.cpp.orig
-+++ storage/connect/libdoc.cpp
-@@ -93,7 +93,7 @@ class LIBXMLDOC : public XMLDOCUMENT {
-   xmlXPathContextPtr Ctxp;
-   xmlXPathObjectPtr  Xop;
-   xmlXPathObjectPtr  NlXop;
--  xmlErrorPtr        Xerr;
-+  const xmlError *   Xerr;
-   char              *Buf;                  // Temporary
-   bool               Nofreelist;
- }; // end of class LIBXMLDOC
-@@ -366,7 +366,7 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn)
- 
-     return false;
-   } else if ((Xerr = xmlGetLastError()))
--    xmlResetError(Xerr);
-+    xmlResetLastError();
- 
-   return true;
-   } // end of ParseFile
-@@ -505,9 +505,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn)
- #if 1
-   // This function does not crash (
-   if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) {
--    xmlErrorPtr err = xmlGetLastError();
-+    const xmlError * err = xmlGetLastError();
-     strcpy(g->Message, (err) ? err->message : "Error saving XML doc");
--    xmlResetError(Xerr);
-+    xmlResetLastError();
-     rc = -1;
-     } // endif Save
- //  rc = xmlDocDump(of, Docp);
-@@ -547,7 +547,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-       xmlXPathFreeNodeSet(Nlist);
- 
-       if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+        xmlResetLastError();
- 
-       Nlist = NULL;
-       } // endif Nlist
-@@ -556,7 +556,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-       xmlXPathFreeObject(Xop);
- 
-       if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+        xmlResetLastError();
- 
-       Xop = NULL;
-       } // endif Xop
-@@ -565,7 +565,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-       xmlXPathFreeObject(NlXop);
- 
-       if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+        xmlResetLastError();
- 
-       NlXop = NULL;
-       } // endif NlXop
-@@ -574,7 +574,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp)
-       xmlXPathFreeContext(Ctxp);
- 
-       if ((Xerr = xmlGetLastError()))
--        xmlResetError(Xerr);
-+        xmlResetLastError();
- 
-       Ctxp = NULL;
-       } // endif Ctxp
-@@ -651,7 +651,7 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNod
- 
-     if ((Xerr = xmlGetLastError())) {
-       strcpy(g->Message, Xerr->message);
--      xmlResetError(Xerr);
-+      xmlResetLastError();
-       return NULL;
-       } // endif Xerr
- 
-@@ -1079,7 +1079,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp)
- /******************************************************************/
- void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp)
-   {
--  xmlErrorPtr xerr;
-+  const xmlError * xerr;
- 
-   if (trace(1))
-     htrc("DeleteChild: node=%p\n", dnp);
-@@ -1122,7 +1122,7 @@ err:
-   if (trace(1))
-     htrc("DeleteChild: errmsg=%-.256s\n", xerr->message);
- 
--  xmlResetError(xerr);
-+  xmlResetLastError();
-   } // end of DeleteChild
- 
- /* -------------------- class XML2NODELIST ---------------------- */
diff --git a/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt b/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt
index 5e45e4de0..1b043db74 100644
--- a/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt
+++ b/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt
@@ -1,7 +1,24 @@
 Index: storage/rocksdb/CMakeLists.txt
 --- storage/rocksdb/CMakeLists.txt.orig
 +++ storage/rocksdb/CMakeLists.txt
-@@ -58,15 +58,6 @@ IF(MSVC_ARM64)
+@@ -32,6 +32,16 @@ IF(HAVE_SCHED_GETCPU)
+   ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1 -DROCKSDB_SCHED_GETCPU_PRESENT)
+ ENDIF()
+ 
++CHECK_FUNCTION_EXISTS(getauxval "sys/auvx.h" HAVE_AUXV_GETAUXVAL)
++if(HAVE_AUXV_GETAUXVAL)
++  add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
++endif()
++
++CHECK_FUNCTION_EXISTS(elf_aux_info "sys/auxv.h" HAVE_AUXV_ELF_AUX_INFO)
++if(HAVE_AUXV_ELF_AUX_INFO)
++  add_definitions(-DROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
++endif()
++
+ IF(WITH_VALGRIND)
+   ADD_DEFINITIONS(-DROCKSDB_VALGRIND_RUN=1)
+ ENDIF()
+@@ -64,15 +74,6 @@ IF(MSVC_ARM64)
   SKIP_ROCKSDB_PLUGIN("Windows ARM64 not supported")
  ENDIF()
  
@@ -17,16 +34,16 @@ Index: storage/rocksdb/CMakeLists.txt
  # This plugin needs recent C++ compilers (it is using C++11 features)
  # Skip build for the old compilers
  SET(CXX11_FLAGS)
-@@ -198,7 +189,7 @@ ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
+@@ -206,7 +207,7 @@ ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
  
  # MARIAROCKS-TODO: how to properly depend on -lrt ?
- TARGET_LINK_LIBRARIES(rocksdb_aux_lib rocksdblib ${ZLIB_LIBRARY})
+ TARGET_LINK_LIBRARIES(rocksdb_aux_lib rocksdblib ${ZLIB_LIBRARIES})
 -if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
 +if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "SecBSD")
    TARGET_LINK_LIBRARIES(rocksdb_aux_lib -lrt)
  endif()
  TARGET_LINK_LIBRARIES(rocksdb_aux_lib ${ATOMIC_EXTRA_LIBS})
-@@ -249,7 +240,7 @@ ENDIF()
+@@ -257,7 +258,7 @@ ENDIF()
  #  ADD_SUBDIRECTORY(unittest)
  #ENDIF()
  
diff --git a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
index b73e9bdef..bbfacc963 100644
--- a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
+++ b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
@@ -6,15 +6,15 @@
   https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
 - Adding ARM AT_HWCAP support for FreeBSD
   https://github.com/facebook/rocksdb/commit/93c6c18cf9731f47b386dd445dc13363423c507e
-- Add OpenBSD/arm64 support for detection of CRC32 and PMULL
-  https://github.com/facebook/rocksdb/commit/4a6906e28ce058f6cea085b394a1adbd19aa468e
+- Add elf_aux_info() support for OpenBSD
+  https://github.com/facebook/rocksdb/pull/12967
 
 https://jira.mariadb.org/browse/MDEV-29875
 
 Index: storage/rocksdb/rocksdb/util/crc32c_arm64.cc
 --- storage/rocksdb/rocksdb/util/crc32c_arm64.cc.orig
 +++ storage/rocksdb/rocksdb/util/crc32c_arm64.cc
-@@ -5,13 +5,26 @@
+@@ -5,13 +5,21 @@
  
  #include "util/crc32c_arm64.h"
  
@@ -24,25 +24,20 @@ Index: storage/rocksdb/rocksdb/util/crc32c_arm64.cc
 +#if defined(__linux__)
  #include <asm/hwcap.h>
 +#endif
-+#ifdef ROCKSDB_AUXV_GETAUXVAL_PRESENT
++#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || \
++    defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
  #include <sys/auxv.h>
-+#endif
  #ifndef HWCAP_CRC32
  #define HWCAP_CRC32 (1 << 7)
  #endif
 +#ifndef HWCAP_PMULL
 +#define HWCAP_PMULL (1 << 4)
 +#endif
-+#if defined(__OpenBSD__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <machine/cpu.h>
-+#include <machine/armreg.h>
 +#endif
  
  #ifdef HAVE_ARM64_CRYPTO
  /* unfolding to compute 8 * 3 = 24 bytes parallelly */
-@@ -33,18 +46,72 @@
+@@ -33,18 +41,52 @@
    } while (0)
  #endif
  
@@ -50,25 +45,15 @@ Index: storage/rocksdb/rocksdb/util/crc32c_arm64.cc
 +
  uint32_t crc32c_runtime_check(void) {
 -  uint64_t auxv = getauxval(AT_HWCAP);
-+#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__)
++#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || \
++    defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
 +  uint64_t auxv = 0;
 +#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT)
 +  auxv = getauxval(AT_HWCAP);
-+#elif defined(__FreeBSD__)
++#elif defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
 +  elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));
 +#endif
    return (auxv & HWCAP_CRC32) != 0;
-+#elif defined(__OpenBSD__)
-+  int r = 0;
-+  const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+  uint64_t isar0;
-+  size_t len = sizeof(isar0);
-+
-+  if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) != -1) {
-+      if (ID_AA64ISAR0_CRC32(isar0) >= ID_AA64ISAR0_CRC32_BASE)
-+        r = 1;
-+  }
-+  return r;
 +#else
 +  return 0;
 +#endif
@@ -77,25 +62,15 @@ Index: storage/rocksdb/rocksdb/util/crc32c_arm64.cc
 -uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data,
 -                             unsigned len) {
 +bool crc32c_pmull_runtime_check(void) {
-+#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__)
++#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || \
++    defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
 +  uint64_t auxv = 0;
 +#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT)
 +  auxv = getauxval(AT_HWCAP);
-+#elif defined(__FreeBSD__)
++#elif defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
 +  elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));
 +#endif
 +  return (auxv & HWCAP_PMULL) != 0;
-+#elif defined(__OpenBSD__)
-+  bool r = false;
-+  const int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 };
-+  uint64_t isar0;
-+  size_t len = sizeof(isar0);
-+
-+  if (sysctl(isar0_mib, 2, &isar0, &len, NULL, 0) != -1) {
-+      if (ID_AA64ISAR0_AES(isar0) >= ID_AA64ISAR0_AES_PMULL)
-+        r = true;
-+  }
-+  return r;
 +#else
 +  return false;
 +#endif
@@ -118,7 +93,7 @@ Index: storage/rocksdb/rocksdb/util/crc32c_arm64.cc
  #ifdef HAVE_ARM64_CRYPTO
  /* Crc32c Parallel computation
   *   Algorithm comes from Intel whitepaper:
-@@ -55,51 +122,53 @@ uint32_t crc32c_arm64(uint32_t crc, unsigned char cons
+@@ -55,51 +97,53 @@ uint32_t crc32c_arm64(uint32_t crc, unsigned char cons
   *   One Block: 42(BLK_LENGTH) * 8(step length: crc32c_u64) bytes
   */
  #define BLK_LENGTH 42
diff --git a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
index d469ce6f0..32daea61e 100644
--- a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
+++ b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
@@ -2,13 +2,27 @@
   https://github.com/facebook/rocksdb/commit/29f7bbef995bdf83098963799c66af742e95373f
 - Fix compilation on Apple Silicon
   https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
+- Fix build on FreeBSD/powerpc64(le)
+  https://github.com/facebook/rocksdb/commit/66e54c59847e316bb78dce786d2206d500bf8a90
+- Add elf_aux_info() support for OpenBSD
+  https://github.com/facebook/rocksdb/pull/12967
 
 https://jira.mariadb.org/browse/MDEV-29875
 
 Index: storage/rocksdb/rocksdb/util/crc32c.cc
 --- storage/rocksdb/rocksdb/util/crc32c.cc.orig
 +++ storage/rocksdb/rocksdb/util/crc32c.cc
-@@ -39,6 +39,10 @@
+@@ -35,10 +35,20 @@
+ #define AT_HWCAP2 26
+ #endif
+ 
++#elif __FreeBSD__ && ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT
++#include <machine/cpu.h>
++#include <sys/auxv.h>
++#include <sys/elf_common.h>
++#elif __OpenBSD__ && ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT
++#include <sys/auxv.h>
+ #endif /* __linux__ */
  
  #endif
  
@@ -19,7 +33,26 @@ Index: storage/rocksdb/rocksdb/util/crc32c.cc
  namespace ROCKSDB_NAMESPACE {
  namespace crc32c {
  
-@@ -468,7 +472,7 @@ static bool isAltiVec() {
+@@ -457,6 +467,18 @@ static int arch_ppc_probe(void) {
+ 
+   return arch_ppc_crc32;
+ }
++#elif __FreeBSD__ || __OpenBSD__
++static int arch_ppc_probe(void) {
++  unsigned long cpufeatures;
++  arch_ppc_crc32 = 0;
++
++#if defined(__powerpc64__) && defined(ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
++  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
++  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
++#endif  /* __powerpc64__ */
++
++  return arch_ppc_crc32;
++}
+ #endif  // __linux__
+ 
+ static bool isAltiVec() {
+@@ -468,7 +490,7 @@ static bool isAltiVec() {
  }
  #endif
  
@@ -28,7 +61,7 @@ Index: storage/rocksdb/rocksdb/util/crc32c.cc
  uint32_t ExtendARMImpl(uint32_t crc, const char *buf, size_t size) {
    return crc32c_arm64(crc, (const unsigned char *)buf, size);
  }
-@@ -488,10 +492,11 @@ std::string IsFastCrc32Supported() {
+@@ -488,10 +510,11 @@ std::string IsFastCrc32Supported() {
    has_fast_crc = false;
    arch = "PPC";
  #endif
@@ -41,7 +74,7 @@ Index: storage/rocksdb/rocksdb/util/crc32c.cc
    } else {
      has_fast_crc = false;
      arch = "Arm64";
-@@ -1220,8 +1225,9 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, si
+@@ -1220,8 +1243,9 @@ uint32_t crc32c_3way(uint32_t crc, const char* buf, si
  static inline Function Choose_Extend() {
  #ifdef HAVE_POWER8
    return isAltiVec() ? ExtendPPCImpl : ExtendImpl<Slow_CRC32>;
diff --git a/databases/mariadb/patches/patch-support-files_CMakeLists_txt b/databases/mariadb/patches/patch-support-files_CMakeLists_txt
index 3fe33a014..a202c02d0 100644
--- a/databases/mariadb/patches/patch-support-files_CMakeLists_txt
+++ b/databases/mariadb/patches/patch-support-files_CMakeLists_txt
@@ -3,7 +3,7 @@ Adjust the pkg-config file path since the port puts the shared libs in a sub dir
 Index: support-files/CMakeLists.txt
 --- support-files/CMakeLists.txt.orig
 +++ support-files/CMakeLists.txt
-@@ -96,7 +96,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -109,7 +109,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
    ENDIF()
  
    CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
diff --git a/databases/mariadb/pkg/PFRAG.le-tests b/databases/mariadb/pkg/PFRAG.le-tests
index 80e3a98d0..a18d8de21 100644
--- a/databases/mariadb/pkg/PFRAG.le-tests
+++ b/databases/mariadb/pkg/PFRAG.le-tests
@@ -240,9 +240,7 @@ share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_normalizer_
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_normalizer_no_utf8_charset_with_utf8_normalizer.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_normalizer_none.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_normalizer_parameter.result
-share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_parser_comment.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_parser_default.result
-share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_parser_off.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_token_filters_multiple_token_filters.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_token_filters_one_token_filter.result
 share/mysql-test/plugin/mroonga/mroonga/storage/r/create_table_index_token_filters_parameter.result
@@ -842,9 +840,7 @@ share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_normalizer_
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_normalizer_no_utf8_charset_with_utf8_normalizer.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_normalizer_none.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_normalizer_parameter.test
-share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_parser_comment.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_parser_default.test
-share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_parser_off.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_token_filters_multiple_token_filters.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_token_filters_one_token_filter.test
 share/mysql-test/plugin/mroonga/mroonga/storage/t/create_table_index_token_filters_parameter.test
@@ -1318,7 +1314,6 @@ share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_index_flags_with_
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_normalizer_comment.result
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_normalizer_fulltext_index_bin.result
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_normalizer_parameter.result
-share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_parser_comment.result
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_token_filters_index_multiple_token_filters.result
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_token_filters_index_one_token_filter.result
 share/mysql-test/plugin/mroonga/mroonga/wrapper/r/create_table_token_filters_index_parameter.result
@@ -1449,7 +1444,6 @@ share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_index_flags_with_
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_normalizer_comment.test
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_normalizer_fulltext_index_bin.test
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_normalizer_parameter.test
-share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_parser_comment.test
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_token_filters_index_multiple_token_filters.test
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_token_filters_index_one_token_filter.test
 share/mysql-test/plugin/mroonga/mroonga/wrapper/t/create_table_token_filters_index_parameter.test
diff --git a/databases/mariadb/pkg/PFRAG.rocksdb-server b/databases/mariadb/pkg/PFRAG.rocksdb-server
index 3ada246af..344d9c526 100644
--- a/databases/mariadb/pkg/PFRAG.rocksdb-server
+++ b/databases/mariadb/pkg/PFRAG.rocksdb-server
@@ -1,6 +1,9 @@
+@conflict mariadb-client-<11.4.3p0v1
 @bin bin/mariadb-ldb
 bin/myrocks_hotbackup
 bin/mysql_ldb
 @bin bin/sst_dump
 @so lib/mysql/plugin/ha_rocksdb.so
+@man man/man1/mariadb-ldb.1
 @man man/man1/myrocks_hotbackup.1
+@man man/man1/mysql_ldb.1
diff --git a/databases/mariadb/pkg/PLIST-main b/databases/mariadb/pkg/PLIST-main
index d276b16b6..1d3e995df 100644
--- a/databases/mariadb/pkg/PLIST-main
+++ b/databases/mariadb/pkg/PLIST-main
@@ -54,7 +54,6 @@ include/mysql/mysql/
 include/mysql/mysql.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysqld_error.h
@@ -84,7 +83,6 @@ lib/pkgconfig/mariadb.pc
 @man man/man1/mariadb-find-rows.1
 @man man/man1/mariadb-hotcopy.1
 @man man/man1/mariadb-import.1
-@man man/man1/mariadb-ldb.1
 @man man/man1/mariadb-plugin.1
 @man man/man1/mariadb-service-convert.1
 @man man/man1/mariadb-setpermission.1
@@ -100,7 +98,6 @@ lib/pkgconfig/mariadb.pc
 @man man/man1/mysql_config.1
 @man man/man1/mysql_embedded.1
 @man man/man1/mysql_find_rows.1
-@man man/man1/mysql_ldb.1
 @man man/man1/mysql_waitpid.1
 @man man/man1/mysqlaccess.1
 @man man/man1/mysqladmin.1
diff --git a/databases/mariadb/pkg/PLIST-server b/databases/mariadb/pkg/PLIST-server
index cd09c25ba..343ec8cfa 100644
--- a/databases/mariadb/pkg/PLIST-server
+++ b/databases/mariadb/pkg/PLIST-server
@@ -125,6 +125,7 @@ include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h
 include/mysql/server/mysql/service_my_print_error.h
 include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_print_check_msg.h
 include/mysql/server/mysql/service_progress_report.h
 include/mysql/server/mysql/service_sha1.h
 include/mysql/server/mysql/service_sha2.h
@@ -158,17 +159,21 @@ include/mysql/server/private/atomic/solaris.h
 include/mysql/server/private/authors.h
 include/mysql/server/private/backup.h
 include/mysql/server/private/bounded_queue.h
+include/mysql/server/private/char_buffer.h
+include/mysql/server/private/charset_collations.h
 include/mysql/server/private/client_settings.h
 include/mysql/server/private/compat56.h
 include/mysql/server/private/config.h
 include/mysql/server/private/contributors.h
 include/mysql/server/private/create_options.h
 include/mysql/server/private/create_tmp_table.h
+include/mysql/server/private/cset_narrowing.h
 include/mysql/server/private/custom_conf.h
 include/mysql/server/private/datadict.h
 include/mysql/server/private/ddl_log.h
 include/mysql/server/private/debug.h
 include/mysql/server/private/debug_sync.h
+include/mysql/server/private/deprecation.h
 include/mysql/server/private/derived_handler.h
 include/mysql/server/private/derror.h
 include/mysql/server/private/des_key_file.h
@@ -190,6 +195,7 @@ include/mysql/server/private/gcalc_tools.h
 include/mysql/server/private/grant.h
 include/mysql/server/private/group_by_handler.h
 include/mysql/server/private/gstream.h
+include/mysql/server/private/gtid_index.h
 include/mysql/server/private/ha_handler_stats.h
 include/mysql/server/private/ha_partition.h
 include/mysql/server/private/ha_sequence.h
@@ -216,18 +222,22 @@ include/mysql/server/private/item_timefunc.h
 include/mysql/server/private/item_vers.h
 include/mysql/server/private/item_windowfunc.h
 include/mysql/server/private/item_xmlfunc.h
+include/mysql/server/private/json_schema.h
+include/mysql/server/private/json_schema_helper.h
 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_ident.h
 include/mysql/server/private/lex_string.h
 include/mysql/server/private/lex_symbol.h
 include/mysql/server/private/lf.h
 include/mysql/server/private/lock.h
 include/mysql/server/private/log.h
+include/mysql/server/private/log_cache.h
 include/mysql/server/private/log_event.h
-include/mysql/server/private/log_event_old.h
+include/mysql/server/private/log_event_data_type.h
 include/mysql/server/private/log_slow.h
 include/mysql/server/private/maria.h
 include/mysql/server/private/mariadb.h
@@ -235,7 +245,6 @@ include/mysql/server/private/mdl.h
 include/mysql/server/private/mem_root_array.h
 include/mysql/server/private/message.h
 include/mysql/server/private/multi_range_read.h
-include/mysql/server/private/my_alarm.h
 include/mysql/server/private/my_apc.h
 include/mysql/server/private/my_atomic.h
 include/mysql/server/private/my_atomic_wrapper.h
@@ -261,6 +270,7 @@ include/mysql/server/private/my_service_manager.h
 include/mysql/server/private/my_stack_alloc.h
 include/mysql/server/private/my_stacktrace.h
 include/mysql/server/private/my_time.h
+include/mysql/server/private/my_tracker.h
 include/mysql/server/private/my_tree.h
 include/mysql/server/private/my_uctype.h
 include/mysql/server/private/my_user.h
@@ -274,9 +284,12 @@ include/mysql/server/private/mysqld_suffix.h
 include/mysql/server/private/mysys_err.h
 include/mysql/server/private/opt_histogram_json.h
 include/mysql/server/private/opt_range.h
+include/mysql/server/private/opt_rewrite_date_cmp.h
 include/mysql/server/private/opt_subselect.h
 include/mysql/server/private/opt_trace.h
 include/mysql/server/private/opt_trace_context.h
+include/mysql/server/private/optimizer_costs.h
+include/mysql/server/private/optimizer_defaults.h
 include/mysql/server/private/parse_file.h
 include/mysql/server/private/partition_element.h
 include/mysql/server/private/partition_info.h
@@ -317,7 +330,6 @@ include/mysql/server/private/rpl_injector.h
 include/mysql/server/private/rpl_mi.h
 include/mysql/server/private/rpl_parallel.h
 include/mysql/server/private/rpl_record.h
-include/mysql/server/private/rpl_record_old.h
 include/mysql/server/private/rpl_reporting.h
 include/mysql/server/private/rpl_rli.h
 include/mysql/server/private/rpl_tblmap.h
@@ -332,11 +344,14 @@ include/mysql/server/private/semisync_slave.h
 include/mysql/server/private/service_versions.h
 include/mysql/server/private/session_tracker.h
 include/mysql/server/private/set_var.h
+include/mysql/server/private/simple_tokenizer.h
 include/mysql/server/private/slave.h
+include/mysql/server/private/socketpair.h
 include/mysql/server/private/source_revision.h
 include/mysql/server/private/sp.h
 include/mysql/server/private/sp_cache.h
 include/mysql/server/private/sp_head.h
+include/mysql/server/private/sp_instr.h
 include/mysql/server/private/sp_pcontext.h
 include/mysql/server/private/sp_rcontext.h
 include/mysql/server/private/span.h
@@ -423,9 +438,11 @@ include/mysql/server/private/sql_type_int.h
 include/mysql/server/private/sql_type_json.h
 include/mysql/server/private/sql_type_real.h
 include/mysql/server/private/sql_type_string.h
+include/mysql/server/private/sql_type_timeofday.h
 include/mysql/server/private/sql_udf.h
 include/mysql/server/private/sql_union.h
 include/mysql/server/private/sql_update.h
+include/mysql/server/private/sql_used.h
 include/mysql/server/private/sql_view.h
 include/mysql/server/private/sql_window.h
 include/mysql/server/private/ssl_compat.h
@@ -435,7 +452,6 @@ include/mysql/server/private/sys_vars_shared.h
 include/mysql/server/private/t_ctype.h
 include/mysql/server/private/table.h
 include/mysql/server/private/table_cache.h
-include/mysql/server/private/thr_alarm.h
 include/mysql/server/private/thr_lock.h
 include/mysql/server/private/thr_malloc.h
 include/mysql/server/private/thr_timer.h
@@ -452,20 +468,22 @@ include/mysql/server/private/vers_string.h
 include/mysql/server/private/violite.h
 include/mysql/server/private/waiting_threads.h
 include/mysql/server/private/welcome_copyright_notice.h
-include/mysql/server/private/win_tzname_data.h
 include/mysql/server/private/winservice.h
 include/mysql/server/private/wqueue.h
 include/mysql/server/private/wsrep.h
+include/mysql/server/private/wsrep_allowlist_service.h
 include/mysql/server/private/wsrep_applier.h
 include/mysql/server/private/wsrep_binlog.h
 include/mysql/server/private/wsrep_client_service.h
 include/mysql/server/private/wsrep_client_state.h
 include/mysql/server/private/wsrep_condition_variable.h
+include/mysql/server/private/wsrep_event_service.h
 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_plugin.h
 include/mysql/server/private/wsrep_priv.h
 include/mysql/server/private/wsrep_schema.h
 include/mysql/server/private/wsrep_server_service.h
@@ -576,6 +594,7 @@ libexec/mysqld
 @man man/man1/replace.1
 @man man/man1/resolve_stack_dump.1
 @man man/man1/resolveip.1
+@man man/man1/wsrep_sst_backup.1
 @man man/man1/wsrep_sst_common.1
 @man man/man1/wsrep_sst_mariabackup.1
 @man man/man1/wsrep_sst_mysqldump.1
@@ -597,10 +616,10 @@ share/examples/login.conf.d/mysqld
 share/examples/mysql/
 share/examples/mysql/binary-configure
 share/examples/mysql/magic
+share/examples/mysql/mariadb.logrotate
 share/examples/mysql/mini-benchmark
 share/examples/mysql/my.cnf
 @sample ${SYSCONFDIR}/my.cnf
-share/examples/mysql/mysql-log-rotate
 share/examples/mysql/mysql.server
 share/examples/mysql/mysqld_multi.server
 share/examples/mysql/policy/
@@ -655,12 +674,13 @@ share/mysql/dutch/
 share/mysql/dutch/errmsg.sys
 share/mysql/english/
 share/mysql/english/errmsg.sys
-share/mysql/errmsg-utf8.txt
 share/mysql/estonian/
 share/mysql/estonian/errmsg.sys
 share/mysql/fill_help_tables.sql
 share/mysql/french/
 share/mysql/french/errmsg.sys
+share/mysql/georgian/
+share/mysql/georgian/errmsg.sys
 share/mysql/german/
 share/mysql/german/errmsg.sys
 share/mysql/greek/
@@ -678,12 +698,12 @@ share/mysql/korean/errmsg.sys
 share/mysql/maria_add_gis_sp.sql
 share/mysql/maria_add_gis_sp_bootstrap.sql
 %%rocksdb%%
-share/mysql/mysql_performance_tables.sql
-share/mysql/mysql_sys_schema.sql
-share/mysql/mysql_system_tables.sql
-share/mysql/mysql_system_tables_data.sql
-share/mysql/mysql_test_data_timezone.sql
-share/mysql/mysql_test_db.sql
+share/mysql/mariadb_performance_tables.sql
+share/mysql/mariadb_sys_schema.sql
+share/mysql/mariadb_system_tables.sql
+share/mysql/mariadb_system_tables_data.sql
+share/mysql/mariadb_test_data_timezone.sql
+share/mysql/mariadb_test_db.sql
 share/mysql/norwegian/
 share/mysql/norwegian-ny/
 share/mysql/norwegian-ny/errmsg.sys
@@ -702,6 +722,8 @@ share/mysql/slovak/
 share/mysql/slovak/errmsg.sys
 share/mysql/spanish/
 share/mysql/spanish/errmsg.sys
+share/mysql/swahili/
+share/mysql/swahili/errmsg.sys
 share/mysql/swedish/
 share/mysql/swedish/errmsg.sys
 share/mysql/ukrainian/
diff --git a/databases/mariadb/pkg/PLIST-tests b/databases/mariadb/pkg/PLIST-tests
index cc0db1031..338859eea 100644
--- a/databases/mariadb/pkg/PLIST-tests
+++ b/databases/mariadb/pkg/PLIST-tests
@@ -132,8 +132,10 @@ share/mysql-test/include/
 share/mysql-test/include/add_anonymous_users.inc
 share/mysql-test/include/alter_table_mdev539.inc
 share/mysql-test/include/analyze-format.inc
+share/mysql-test/include/analyze-no-filtered.inc
 share/mysql-test/include/analyze-sync_with_master.test
 share/mysql-test/include/analyze-timeout.test
+share/mysql-test/include/aria_log_control_load.inc
 share/mysql-test/include/assert.inc
 share/mysql-test/include/assert_grep.inc
 share/mysql-test/include/autoinc_mdev15353.inc
@@ -142,6 +144,8 @@ share/mysql-test/include/big_test.inc
 share/mysql-test/include/big_test.require
 share/mysql-test/include/binlog_combinations.combinations
 share/mysql-test/include/binlog_combinations.inc
+share/mysql-test/include/binlog_format_combinations.combinations
+share/mysql-test/include/binlog_format_combinations.inc
 share/mysql-test/include/binlog_inject_error.inc
 share/mysql-test/include/binlog_parallel_replication_marks.test
 share/mysql-test/include/binlog_start_pos.inc
@@ -154,6 +158,8 @@ share/mysql-test/include/case_sensitive_file_system.require
 share/mysql-test/include/check-testcase.test
 share/mysql-test/include/check-warnings.test
 share/mysql-test/include/check_concurrent_insert.inc
+share/mysql-test/include/check_digest.inc
+share/mysql-test/include/check_digest_end.inc
 share/mysql-test/include/check_events_off.inc
 share/mysql-test/include/check_ftwrl_compatible.inc
 share/mysql-test/include/check_ftwrl_incompatible.inc
@@ -162,6 +168,7 @@ share/mysql-test/include/check_key_reads.inc
 share/mysql-test/include/check_key_req.inc
 share/mysql-test/include/check_no_concurrent_insert.inc
 share/mysql-test/include/check_no_row_lock.inc
+share/mysql-test/include/check_qep.inc
 share/mysql-test/include/check_shared_row_lock.inc
 share/mysql-test/include/check_slave_is_running.inc
 share/mysql-test/include/check_slave_no_error.inc
@@ -184,6 +191,7 @@ share/mysql-test/include/ctype_8bit.inc
 share/mysql-test/include/ctype_E05C.inc
 share/mysql-test/include/ctype_ascii_order.inc
 share/mysql-test/include/ctype_casefolding.inc
+share/mysql-test/include/ctype_casefolding_supplementary.inc
 share/mysql-test/include/ctype_common.inc
 share/mysql-test/include/ctype_czech.inc
 share/mysql-test/include/ctype_datetime.inc
@@ -212,6 +220,8 @@ share/mysql-test/include/ctype_regex_utf8.inc
 share/mysql-test/include/ctype_str_to_date.inc
 share/mysql-test/include/ctype_strtoll10.inc
 share/mysql-test/include/ctype_thai.inc
+share/mysql-test/include/ctype_uca1400_ids_using_convert.inc
+share/mysql-test/include/ctype_uca1400_ids_using_set_names.inc
 share/mysql-test/include/ctype_uca_w2.inc
 share/mysql-test/include/ctype_unescape.inc
 share/mysql-test/include/ctype_unicode520.inc
@@ -223,6 +233,7 @@ share/mysql-test/include/ctype_unicode_ws_bmp.inc
 share/mysql-test/include/ctype_unicode_ws_supplementary.inc
 share/mysql-test/include/ctype_utf8_ilseq.inc
 share/mysql-test/include/ctype_utf8_table.inc
+share/mysql-test/include/ctype_utf8mb3_uca_char.inc
 share/mysql-test/include/ctype_utf8mb4.inc
 share/mysql-test/include/daemon_example_bad_format.ini
 share/mysql-test/include/daemon_example_bad_soname.ini
@@ -239,6 +250,12 @@ share/mysql-test/include/default_my.cnf
 share/mysql-test/include/default_mysqld.cnf
 share/mysql-test/include/default_optimizer_switch.inc
 share/mysql-test/include/delete_anonymous_users.inc
+share/mysql-test/include/delete_use_source.inc
+share/mysql-test/include/delete_use_source_cases.inc
+share/mysql-test/include/delete_use_source_cases_memory.inc
+share/mysql-test/include/delete_use_source_cases_non_innodb.inc
+share/mysql-test/include/delete_use_source_innodb.inc
+share/mysql-test/include/delete_use_source_memory.inc
 share/mysql-test/include/diff_servers.inc
 share/mysql-test/include/diff_tables.inc
 share/mysql-test/include/empty_string_literal.inc
@@ -246,7 +263,11 @@ share/mysql-test/include/end_include_file.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/ensure_binlog_row_event_columns.inc
 share/mysql-test/include/equal_fields_propagation_datetime.inc
+share/mysql-test/include/execute_with_statistics.inc
 share/mysql-test/include/expect_crash.inc
+share/mysql-test/include/expect_qep.inc
+share/mysql-test/include/explain-no-costs-filtered.inc
+share/mysql-test/include/explain-no-costs.inc
 share/mysql-test/include/explain_non_select.inc
 share/mysql-test/include/explain_utils.inc
 share/mysql-test/include/file_does_not_exist.inc
@@ -266,6 +287,8 @@ share/mysql-test/include/galera_init.inc
 share/mysql-test/include/galera_no_debug_sync.inc
 share/mysql-test/include/galera_set_sync_point.inc
 share/mysql-test/include/galera_signal_sync_point.inc
+share/mysql-test/include/galera_sst_method.combinations
+share/mysql-test/include/galera_sst_method.inc
 share/mysql-test/include/galera_suspend.inc
 share/mysql-test/include/galera_variables_ok.inc
 share/mysql-test/include/galera_variables_ok_debug.inc
@@ -305,6 +328,7 @@ share/mysql-test/include/have_blackhole.opt
 share/mysql-test/include/have_case_insensitive_file_system.inc
 share/mysql-test/include/have_case_insensitive_fs.inc
 share/mysql-test/include/have_case_sensitive_file_system.inc
+share/mysql-test/include/have_cgroupv2.inc
 share/mysql-test/include/have_collation.inc
 share/mysql-test/include/have_compress.inc
 share/mysql-test/include/have_compress.require
@@ -328,13 +352,18 @@ share/mysql-test/include/have_geometry.inc
 share/mysql-test/include/have_geometry.require
 share/mysql-test/include/have_gzip.inc
 share/mysql-test/include/have_hostname_cache.inc
-share/mysql-test/include/have_innodb.combinations
 share/mysql-test/include/have_innodb.inc
+share/mysql-test/include/have_innodb.opt
 share/mysql-test/include/have_innodb_16k.inc
+share/mysql-test/include/have_innodb_16k.opt
 share/mysql-test/include/have_innodb_32k.inc
+share/mysql-test/include/have_innodb_32k.opt
 share/mysql-test/include/have_innodb_4k.inc
+share/mysql-test/include/have_innodb_4k.opt
 share/mysql-test/include/have_innodb_64k.inc
+share/mysql-test/include/have_innodb_64k.opt
 share/mysql-test/include/have_innodb_8k.inc
+share/mysql-test/include/have_innodb_8k.opt
 share/mysql-test/include/have_innodb_max_16k.inc
 share/mysql-test/include/have_ipv4_mapped.inc
 share/mysql-test/include/have_koi8r.inc
@@ -356,6 +385,7 @@ share/mysql-test/include/have_metadata_lock_info.inc
 share/mysql-test/include/have_metadata_lock_info.opt
 share/mysql-test/include/have_moscow_leap_timezone.require
 share/mysql-test/include/have_mutex_deadlock_detector.inc
+share/mysql-test/include/have_normal_zlib.inc
 share/mysql-test/include/have_numa.inc
 share/mysql-test/include/have_openssl.inc
 share/mysql-test/include/have_outfile.inc
@@ -390,6 +420,7 @@ 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
+share/mysql-test/include/have_tlsv13.inc
 share/mysql-test/include/have_type_mysql_json.inc
 share/mysql-test/include/have_type_mysql_json.opt
 share/mysql-test/include/have_ucs2.inc
@@ -436,6 +467,8 @@ 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
+share/mysql-test/include/innodb_stable_estimates.inc
+share/mysql-test/include/innodb_stable_estimates.opt
 share/mysql-test/include/innodb_trx_weight.inc
 share/mysql-test/include/innodb_undo_tablespaces.combinations
 share/mysql-test/include/innodb_undo_tablespaces.inc
@@ -452,6 +485,7 @@ share/mysql-test/include/kill_galera.inc
 share/mysql-test/include/kill_mysqld.inc
 share/mysql-test/include/kill_query.inc
 share/mysql-test/include/kill_query_and_diff_master_slave.inc
+share/mysql-test/include/last_query_cost.inc
 share/mysql-test/include/lcase_names.combinations
 share/mysql-test/include/lcase_names.inc
 share/mysql-test/include/libdaemon_example.ini
@@ -460,6 +494,8 @@ share/mysql-test/include/linux_sys_vars.inc
 share/mysql-test/include/load_dump_and_upgrade.inc
 share/mysql-test/include/load_sysvars.inc
 share/mysql-test/include/loaddata_autocom.inc
+share/mysql-test/include/log_bin.combinations
+share/mysql-test/include/log_bin.inc
 share/mysql-test/include/log_grep.inc
 share/mysql-test/include/log_slow_cleanup.inc
 share/mysql-test/include/log_slow_debug_common.inc
@@ -527,6 +563,7 @@ share/mysql-test/include/not_windows.inc
 share/mysql-test/include/not_windows_embedded.inc
 share/mysql-test/include/one_thread_per_connection.inc
 share/mysql-test/include/one_thread_per_connection.require
+share/mysql-test/include/optimizer_trace_no_costs.inc
 share/mysql-test/include/parser_bug21114.inc
 share/mysql-test/include/partition_date_range.inc
 share/mysql-test/include/partition_mrr.inc
@@ -547,10 +584,12 @@ share/mysql-test/include/ps_renew.inc
 share/mysql-test/include/query_cache.inc
 share/mysql-test/include/query_cache_partitions.inc
 share/mysql-test/include/query_cache_sql_prepare.inc
+share/mysql-test/include/read_head.inc
 share/mysql-test/include/read_many_rows.inc
 share/mysql-test/include/relocate_binlogs.inc
 share/mysql-test/include/require_openssl_client.inc
 share/mysql-test/include/reset_master_slave.inc
+share/mysql-test/include/reset_slave.inc
 share/mysql-test/include/restart_mysqld.inc
 share/mysql-test/include/restart_slave_sql.inc
 share/mysql-test/include/restore_charset.inc
@@ -558,6 +597,7 @@ 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
+share/mysql-test/include/rpl_clone_slave_using_mariadb-backup.inc
 share/mysql-test/include/rpl_connect.inc
 share/mysql-test/include/rpl_connection.inc
 share/mysql-test/include/rpl_diff.inc
@@ -586,8 +626,10 @@ share/mysql-test/include/rpl_stop_slaves.inc
 share/mysql-test/include/rpl_sync.inc
 share/mysql-test/include/rpl_udf.inc
 share/mysql-test/include/running_event_scheduler.inc
+share/mysql-test/include/sargable_casefold.inc
 share/mysql-test/include/save_master_gtid.inc
 share/mysql-test/include/save_master_pos.inc
+share/mysql-test/include/search_condition.inc
 share/mysql-test/include/search_pattern_in_file.inc
 share/mysql-test/include/set_binlog_format_mixed.sql
 share/mysql-test/include/set_binlog_format_row.sql
@@ -610,6 +652,7 @@ share/mysql-test/include/show_rpl_debug_info.inc
 share/mysql-test/include/show_slave_hosts.inc
 share/mysql-test/include/show_slave_status.inc
 share/mysql-test/include/shutdown_mysqld.inc
+share/mysql-test/include/slow_environ.inc
 share/mysql-test/include/sp-vars.inc
 share/mysql-test/include/sql_mode_pad_char_to_full_length.inc
 share/mysql-test/include/start_mysqld.inc
@@ -642,6 +685,8 @@ share/mysql-test/include/type_mix_incompatible.inc
 share/mysql-test/include/type_temporal_zero_default.inc
 share/mysql-test/include/unsafe_binlog.inc
 share/mysql-test/include/update_use_source.inc
+share/mysql-test/include/update_use_source_cases.inc
+share/mysql-test/include/update_use_source_ext.inc
 share/mysql-test/include/uses_vardir.inc
 share/mysql-test/include/varchar.inc
 share/mysql-test/include/view_alias.inc
@@ -651,6 +696,7 @@ 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_pattern_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
@@ -670,6 +716,7 @@ share/mysql-test/include/wait_show_condition.inc
 share/mysql-test/include/wait_until_connected_again.inc
 share/mysql-test/include/wait_until_count_sessions.inc
 share/mysql-test/include/wait_until_disconnected.inc
+share/mysql-test/include/wait_until_no_pidfile.inc
 share/mysql-test/include/wait_until_ready.inc
 share/mysql-test/include/wait_until_rows_count.inc
 share/mysql-test/include/wait_wsrep_ready.inc
@@ -733,6 +780,7 @@ 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/ssl-mitm.pl
 share/mysql-test/lib/v1/
 share/mysql-test/lib/v1/My/
 share/mysql-test/lib/v1/My/Config.pm
@@ -781,12 +829,18 @@ share/mysql-test/main/alter_table_errors.result
 share/mysql-test/main/alter_table_errors.test
 share/mysql-test/main/alter_table_lock.result
 share/mysql-test/main/alter_table_lock.test
+share/mysql-test/main/alter_table_locknone.result
+share/mysql-test/main/alter_table_locknone.test
+share/mysql-test/main/alter_table_locknone_notembedded.result
+share/mysql-test/main/alter_table_locknone_notembedded.test
 share/mysql-test/main/alter_table_mdev539_maria.result
 share/mysql-test/main/alter_table_mdev539_maria.test
 share/mysql-test/main/alter_table_mdev539_myisam.result
 share/mysql-test/main/alter_table_mdev539_myisam.test
 share/mysql-test/main/alter_table_online.result
 share/mysql-test/main/alter_table_online.test
+share/mysql-test/main/alter_table_online_debug.result
+share/mysql-test/main/alter_table_online_debug.test
 share/mysql-test/main/alter_table_trans.result
 share/mysql-test/main/alter_table_trans.test
 share/mysql-test/main/alter_table_upgrade_aria.result
@@ -805,6 +859,9 @@ share/mysql-test/main/analyze_debug.test
 share/mysql-test/main/analyze_engine_stats.combinations
 share/mysql-test/main/analyze_engine_stats.result
 share/mysql-test/main/analyze_engine_stats.test
+share/mysql-test/main/analyze_engine_stats2.opt
+share/mysql-test/main/analyze_engine_stats2.result
+share/mysql-test/main/analyze_engine_stats2.test
 share/mysql-test/main/analyze_format_json.result
 share/mysql-test/main/analyze_format_json.test
 share/mysql-test/main/analyze_format_json_emb.result
@@ -815,6 +872,9 @@ share/mysql-test/main/analyze_stmt.result
 share/mysql-test/main/analyze_stmt.test
 share/mysql-test/main/analyze_stmt_orderby.result
 share/mysql-test/main/analyze_stmt_orderby.test
+share/mysql-test/main/analyze_stmt_prefetch_count.opt
+share/mysql-test/main/analyze_stmt_prefetch_count.result
+share/mysql-test/main/analyze_stmt_prefetch_count.test
 share/mysql-test/main/analyze_stmt_privileges.result
 share/mysql-test/main/analyze_stmt_privileges.test
 share/mysql-test/main/analyze_stmt_privileges2.result
@@ -868,6 +928,8 @@ share/mysql-test/main/bad_frm_crash_5029.result
 share/mysql-test/main/bad_frm_crash_5029.test
 share/mysql-test/main/bad_startup_options.result
 share/mysql-test/main/bad_startup_options.test
+share/mysql-test/main/bad_startup_options_debug.result
+share/mysql-test/main/bad_startup_options_debug.test
 share/mysql-test/main/bench_count_distinct.result
 share/mysql-test/main/bench_count_distinct.test
 share/mysql-test/main/bigint.result
@@ -879,6 +941,9 @@ share/mysql-test/main/binary_to_hex.test
 share/mysql-test/main/bind_address_resolution.opt
 share/mysql-test/main/bind_address_resolution.result
 share/mysql-test/main/bind_address_resolution.test
+share/mysql-test/main/bind_multiple_addresses_resolution.opt
+share/mysql-test/main/bind_multiple_addresses_resolution.result
+share/mysql-test/main/bind_multiple_addresses_resolution.test
 share/mysql-test/main/blackhole.result
 share/mysql-test/main/blackhole.test
 share/mysql-test/main/blackhole_plugin.result
@@ -940,6 +1005,8 @@ share/mysql-test/main/cli_options_force_protocol_not_win.test
 share/mysql-test/main/cli_options_force_protocol_win.opt
 share/mysql-test/main/cli_options_force_protocol_win.result
 share/mysql-test/main/cli_options_force_protocol_win.test
+share/mysql-test/main/client.result
+share/mysql-test/main/client.test
 share/mysql-test/main/client_xml.result
 share/mysql-test/main/client_xml.test
 share/mysql-test/main/column_compression.inc
@@ -981,6 +1048,8 @@ share/mysql-test/main/concurrent_innodb_unsafelog.test
 share/mysql-test/main/connect-abstract.cnf
 share/mysql-test/main/connect-abstract.result
 share/mysql-test/main/connect-abstract.test
+share/mysql-test/main/connect-no-db.result
+share/mysql-test/main/connect-no-db.test
 share/mysql-test/main/connect.cnf
 share/mysql-test/main/connect.result
 share/mysql-test/main/connect.test
@@ -995,6 +1064,8 @@ share/mysql-test/main/constraints.result
 share/mysql-test/main/constraints.test
 share/mysql-test/main/contributors.result
 share/mysql-test/main/contributors.test
+share/mysql-test/main/costs.result
+share/mysql-test/main/costs.test
 share/mysql-test/main/count_distinct.result
 share/mysql-test/main/count_distinct.test
 share/mysql-test/main/count_distinct2-master.opt
@@ -1060,6 +1131,8 @@ share/mysql-test/main/create_w_max_indexes_64.result
 share/mysql-test/main/create_w_max_indexes_64.test
 share/mysql-test/main/create_windows.result
 share/mysql-test/main/create_windows.test
+share/mysql-test/main/cset_narrowing.result
+share/mysql-test/main/cset_narrowing.test
 share/mysql-test/main/cte_cycle.result
 share/mysql-test/main/cte_cycle.test
 share/mysql-test/main/cte_grant.result
@@ -1086,6 +1159,13 @@ 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_implicit.result
+share/mysql-test/main/ctype_collate_implicit.test
+share/mysql-test/main/ctype_collate_implicit_def.opt
+share/mysql-test/main/ctype_collate_implicit_def.result
+share/mysql-test/main/ctype_collate_implicit_def.test
+share/mysql-test/main/ctype_collate_implicit_utf32.result
+share/mysql-test/main/ctype_collate_implicit_utf32.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
@@ -1246,6 +1326,10 @@ share/mysql-test/main/ctype_utf8mb4_turkish_ci_casefold.result
 share/mysql-test/main/ctype_utf8mb4_turkish_ci_casefold.test
 share/mysql-test/main/ctype_utf8mb4_uca.result
 share/mysql-test/main/ctype_utf8mb4_uca.test
+share/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci_casefold.result
+share/mysql-test/main/ctype_utf8mb4_uca1400_ai_ci_casefold.test
+share/mysql-test/main/ctype_utf8mb4_uca_allkeys1400.result
+share/mysql-test/main/ctype_utf8mb4_uca_allkeys1400.test
 share/mysql-test/main/ctype_utf8mb4_uca_allkeys400.result
 share/mysql-test/main/ctype_utf8mb4_uca_allkeys400.test
 share/mysql-test/main/ctype_utf8mb4_uca_allkeys520.result
@@ -1261,7 +1345,6 @@ share/mysql-test/main/custom_aggregate_functions.result
 share/mysql-test/main/custom_aggregate_functions.test
 share/mysql-test/main/custom_aggregates_i_s.result
 share/mysql-test/main/custom_aggregates_i_s.test
-share/mysql-test/main/date_formats-master.opt
 share/mysql-test/main/date_formats.result
 share/mysql-test/main/date_formats.test
 share/mysql-test/main/datetime_456.result
@@ -1299,8 +1382,12 @@ share/mysql-test/main/delete_returning.result
 share/mysql-test/main/delete_returning.test
 share/mysql-test/main/delete_returning_grant.result
 share/mysql-test/main/delete_returning_grant.test
+share/mysql-test/main/delete_single_to_multi.result
+share/mysql-test/main/delete_single_to_multi.test
 share/mysql-test/main/delete_use_source.result
 share/mysql-test/main/delete_use_source.test
+share/mysql-test/main/delete_use_source_engines.result
+share/mysql-test/main/delete_use_source_engines.test
 share/mysql-test/main/delimiter_case_mdev_10728.sql
 share/mysql-test/main/delimiter_command_case_sensitivity.result
 share/mysql-test/main/delimiter_command_case_sensitivity.test
@@ -1310,12 +1397,16 @@ share/mysql-test/main/derived.result
 share/mysql-test/main/derived.test
 share/mysql-test/main/derived_cond_pushdown.result
 share/mysql-test/main/derived_cond_pushdown.test
+share/mysql-test/main/derived_cond_pushdown_innodb.result
+share/mysql-test/main/derived_cond_pushdown_innodb.test
 share/mysql-test/main/derived_opt.result
 share/mysql-test/main/derived_opt.test
 share/mysql-test/main/derived_split_innodb.result
 share/mysql-test/main/derived_split_innodb.test
 share/mysql-test/main/derived_view.result
 share/mysql-test/main/derived_view.test
+share/mysql-test/main/desc_index_min_max.result
+share/mysql-test/main/desc_index_min_max.test
 share/mysql-test/main/desc_index_range.result
 share/mysql-test/main/desc_index_range.test
 share/mysql-test/main/dirty_close.result
@@ -1323,6 +1414,8 @@ share/mysql-test/main/dirty_close.test
 share/mysql-test/main/disabled.def
 share/mysql-test/main/distinct.result
 share/mysql-test/main/distinct.test
+share/mysql-test/main/distinct_notembedded.result
+share/mysql-test/main/distinct_notembedded.test
 share/mysql-test/main/drop.result
 share/mysql-test/main/drop.test
 share/mysql-test/main/drop_bad_db_type.result
@@ -1356,37 +1449,6 @@ share/mysql-test/main/error_simulation.result
 share/mysql-test/main/error_simulation.test
 share/mysql-test/main/errors.result
 share/mysql-test/main/errors.test
-share/mysql-test/main/events_1.result
-share/mysql-test/main/events_1.test
-share/mysql-test/main/events_2.result
-share/mysql-test/main/events_2.test
-share/mysql-test/main/events_bugs-master.opt
-share/mysql-test/main/events_bugs.result
-share/mysql-test/main/events_bugs.test
-share/mysql-test/main/events_embedded.result
-share/mysql-test/main/events_embedded.test
-share/mysql-test/main/events_grant.result
-share/mysql-test/main/events_grant.test
-share/mysql-test/main/events_logs_tests-master.opt
-share/mysql-test/main/events_logs_tests.result
-share/mysql-test/main/events_logs_tests.test
-share/mysql-test/main/events_microsec.result
-share/mysql-test/main/events_microsec.test
-share/mysql-test/main/events_restart-master.opt
-share/mysql-test/main/events_restart.result
-share/mysql-test/main/events_restart.test
-share/mysql-test/main/events_scheduling.result
-share/mysql-test/main/events_scheduling.test
-share/mysql-test/main/events_slowlog.result
-share/mysql-test/main/events_slowlog.test
-share/mysql-test/main/events_stress.result
-share/mysql-test/main/events_stress.test
-share/mysql-test/main/events_time_zone.result
-share/mysql-test/main/events_time_zone.test
-share/mysql-test/main/events_trans.result
-share/mysql-test/main/events_trans.test
-share/mysql-test/main/events_trans_notembedded.result
-share/mysql-test/main/events_trans_notembedded.test
 share/mysql-test/main/except.result
 share/mysql-test/main/except.test
 share/mysql-test/main/except_all.result
@@ -1446,6 +1508,8 @@ share/mysql-test/main/flush_block_commit.result
 share/mysql-test/main/flush_block_commit.test
 share/mysql-test/main/flush_block_commit_notembedded.result
 share/mysql-test/main/flush_block_commit_notembedded.test
+share/mysql-test/main/flush_corruption.result
+share/mysql-test/main/flush_corruption.test
 share/mysql-test/main/flush_logs_not_windows.result
 share/mysql-test/main/flush_logs_not_windows.test
 share/mysql-test/main/flush_notembedded.result
@@ -1521,6 +1585,8 @@ share/mysql-test/main/func_equal.result
 share/mysql-test/main/func_equal.test
 share/mysql-test/main/func_extract.result
 share/mysql-test/main/func_extract.test
+share/mysql-test/main/func_format.result
+share/mysql-test/main/func_format.test
 share/mysql-test/main/func_gconcat.result
 share/mysql-test/main/func_gconcat.test
 share/mysql-test/main/func_group.result
@@ -1541,6 +1607,10 @@ share/mysql-test/main/func_json.result
 share/mysql-test/main/func_json.test
 share/mysql-test/main/func_json_notembedded.result
 share/mysql-test/main/func_json_notembedded.test
+share/mysql-test/main/func_kdf,old.rdiff
+share/mysql-test/main/func_kdf.combinations
+share/mysql-test/main/func_kdf.result
+share/mysql-test/main/func_kdf.test
 share/mysql-test/main/func_like.result
 share/mysql-test/main/func_like.test
 share/mysql-test/main/func_math.result
@@ -1555,6 +1625,8 @@ share/mysql-test/main/func_regexp_pcre.result
 share/mysql-test/main/func_regexp_pcre.test
 share/mysql-test/main/func_regexp_pcre_debug.result
 share/mysql-test/main/func_regexp_pcre_debug.test
+share/mysql-test/main/func_replace.result
+share/mysql-test/main/func_replace.test
 share/mysql-test/main/func_rollback.result
 share/mysql-test/main/func_rollback.test
 share/mysql-test/main/func_sapdb.result
@@ -1589,8 +1661,8 @@ share/mysql-test/main/gcc296.result
 share/mysql-test/main/gcc296.test
 share/mysql-test/main/get_diagnostics.result
 share/mysql-test/main/get_diagnostics.test
-share/mysql-test/main/gis-alter_table_online.result
-share/mysql-test/main/gis-alter_table_online.test
+share/mysql-test/main/gis-alter_table.result
+share/mysql-test/main/gis-alter_table.test
 share/mysql-test/main/gis-debug.result
 share/mysql-test/main/gis-debug.test
 share/mysql-test/main/gis-json.result
@@ -1640,6 +1712,8 @@ share/mysql-test/main/grant_lowercase_fs.result
 share/mysql-test/main/grant_lowercase_fs.test
 share/mysql-test/main/grant_master_admin.result
 share/mysql-test/main/grant_master_admin.test
+share/mysql-test/main/grant_plugin.result
+share/mysql-test/main/grant_plugin.test
 share/mysql-test/main/grant_read_only.result
 share/mysql-test/main/grant_read_only.test
 share/mysql-test/main/grant_repair.result
@@ -1733,6 +1807,8 @@ share/mysql-test/main/information_schema_stats.result
 share/mysql-test/main/information_schema_stats.test
 share/mysql-test/main/information_schema_tables.result
 share/mysql-test/main/information_schema_tables.test
+share/mysql-test/main/information_schema_temp_table.result
+share/mysql-test/main/information_schema_temp_table.test
 share/mysql-test/main/init_connect-master.opt
 share/mysql-test/main/init_connect.result
 share/mysql-test/main/init_connect.test
@@ -1749,7 +1825,9 @@ 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,covering,on.rdiff
 share/mysql-test/main/innodb_ext_key,off.rdiff
+share/mysql-test/main/innodb_ext_key,on,unoptimized.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
@@ -1819,12 +1897,16 @@ share/mysql-test/main/ipv4_as_ipv6.test
 share/mysql-test/main/ipv6-master.opt
 share/mysql-test/main/ipv6.result
 share/mysql-test/main/ipv6.test
+share/mysql-test/main/item_types.result
+share/mysql-test/main/item_types.test
 share/mysql-test/main/join.result
 share/mysql-test/main/join.test
 share/mysql-test/main/join_cache.result
 share/mysql-test/main/join_cache.test
 share/mysql-test/main/join_cache_cardinality.result
 share/mysql-test/main/join_cache_cardinality.test
+share/mysql-test/main/join_cache_debug.result
+share/mysql-test/main/join_cache_debug.test
 share/mysql-test/main/join_cache_notasan.result
 share/mysql-test/main/join_cache_notasan.test
 share/mysql-test/main/join_crash.result
@@ -1841,8 +1923,8 @@ share/mysql-test/main/join_outer_innodb.result
 share/mysql-test/main/join_outer_innodb.test
 share/mysql-test/main/join_outer_jcl6.result
 share/mysql-test/main/join_outer_jcl6.test
-share/mysql-test/main/json_debug_nonembedded.result
-share/mysql-test/main/json_debug_nonembedded.test
+share/mysql-test/main/json_debug_nonembedded_noasan.result
+share/mysql-test/main/json_debug_nonembedded_noasan.test
 share/mysql-test/main/json_equals.result
 share/mysql-test/main/json_equals.test
 share/mysql-test/main/json_normalize.result
@@ -1876,10 +1958,14 @@ share/mysql-test/main/large_pages.result
 share/mysql-test/main/large_pages.test
 share/mysql-test/main/last_value.result
 share/mysql-test/main/last_value.test
+share/mysql-test/main/leaks.result
+share/mysql-test/main/leaks.test
 share/mysql-test/main/limit.result
 share/mysql-test/main/limit.test
 share/mysql-test/main/limit_rows_examined.result
 share/mysql-test/main/limit_rows_examined.test
+share/mysql-test/main/load_timezones_with_alter_algorithm_inplace.result
+share/mysql-test/main/load_timezones_with_alter_algorithm_inplace.test
 share/mysql-test/main/loaddata.result
 share/mysql-test/main/loaddata.test
 share/mysql-test/main/loaddata_autocom_innodb.result
@@ -1913,12 +1999,17 @@ share/mysql-test/main/locked_temporary-5955.result
 share/mysql-test/main/locked_temporary-5955.test
 share/mysql-test/main/locking_clause.result
 share/mysql-test/main/locking_clause.test
+share/mysql-test/main/log_crash.result
+share/mysql-test/main/log_crash.test
 share/mysql-test/main/log_errchk.result
 share/mysql-test/main/log_errchk.test
 share/mysql-test/main/log_slow.result
 share/mysql-test/main/log_slow.test
 share/mysql-test/main/log_slow_debug.result
 share/mysql-test/main/log_slow_debug.test
+share/mysql-test/main/log_slow_filter.opt
+share/mysql-test/main/log_slow_filter.result
+share/mysql-test/main/log_slow_filter.test
 share/mysql-test/main/log_slow_innodb.result
 share/mysql-test/main/log_slow_innodb.test
 share/mysql-test/main/log_state-master.opt
@@ -1949,6 +2040,8 @@ share/mysql-test/main/long_unique_big.result
 share/mysql-test/main/long_unique_big.test
 share/mysql-test/main/long_unique_bugs.result
 share/mysql-test/main/long_unique_bugs.test
+share/mysql-test/main/long_unique_bugs_no_sp_protocol.result
+share/mysql-test/main/long_unique_bugs_no_sp_protocol.test
 share/mysql-test/main/long_unique_bugs_replication.result
 share/mysql-test/main/long_unique_bugs_replication.test
 share/mysql-test/main/long_unique_debug.result
@@ -1962,6 +2055,8 @@ share/mysql-test/main/long_unique_update.result
 share/mysql-test/main/long_unique_update.test
 share/mysql-test/main/long_unique_using_hash.result
 share/mysql-test/main/long_unique_using_hash.test
+share/mysql-test/main/lotofstack.result
+share/mysql-test/main/lotofstack.test
 share/mysql-test/main/lowercase_fs_off.result
 share/mysql-test/main/lowercase_fs_off.test
 share/mysql-test/main/lowercase_fs_on.result
@@ -1997,6 +2092,8 @@ share/mysql-test/main/lowercase_utf8.test
 share/mysql-test/main/lowercase_view-master.opt
 share/mysql-test/main/lowercase_view.result
 share/mysql-test/main/lowercase_view.test
+share/mysql-test/main/mariadb-dump-debug.result
+share/mysql-test/main/mariadb-dump-debug.test
 share/mysql-test/main/max_password_errors.result
 share/mysql-test/main/max_password_errors.test
 share/mysql-test/main/max_statement_time.result
@@ -2006,6 +2103,8 @@ share/mysql-test/main/mdev-21101.result
 share/mysql-test/main/mdev-21101.test
 share/mysql-test/main/mdev-25830.result
 share/mysql-test/main/mdev-25830.test
+share/mysql-test/main/mdev-31636.result
+share/mysql-test/main/mdev-31636.test
 share/mysql-test/main/mdev13607.result
 share/mysql-test/main/mdev13607.test
 share/mysql-test/main/mdev19198.result
@@ -2027,17 +2126,6 @@ share/mysql-test/main/mdl.test
 share/mysql-test/main/mdl_sync-master.opt
 share/mysql-test/main/mdl_sync.result
 share/mysql-test/main/mdl_sync.test
-share/mysql-test/main/merge-big.result
-share/mysql-test/main/merge-big.test
-share/mysql-test/main/merge.result
-share/mysql-test/main/merge.test
-share/mysql-test/main/merge_debug.result
-share/mysql-test/main/merge_debug.test
-share/mysql-test/main/merge_innodb.result
-share/mysql-test/main/merge_innodb.test
-share/mysql-test/main/merge_mmap-master.opt
-share/mysql-test/main/merge_mmap.result
-share/mysql-test/main/merge_mmap.test
 share/mysql-test/main/metadata.result
 share/mysql-test/main/metadata.test
 share/mysql-test/main/mix2_myisam.result
@@ -2109,6 +2197,8 @@ share/mysql-test/main/mysql-bug41486.result
 share/mysql-test/main/mysql-bug41486.test
 share/mysql-test/main/mysql-bug45236.result
 share/mysql-test/main/mysql-bug45236.test
+share/mysql-test/main/mysql-interactive.result
+share/mysql-test/main/mysql-interactive.test
 share/mysql-test/main/mysql-metadata.result
 share/mysql-test/main/mysql-metadata.test
 share/mysql-test/main/mysql.result
@@ -2117,6 +2207,8 @@ share/mysql-test/main/mysql5613mysql.result
 share/mysql-test/main/mysql5613mysql.test
 share/mysql-test/main/mysql57_virtual.result
 share/mysql-test/main/mysql57_virtual.test
+share/mysql-test/main/mysql57nopart.result
+share/mysql-test/main/mysql57nopart.test
 share/mysql-test/main/mysql_binary_mode.result
 share/mysql-test/main/mysql_binary_mode.test
 share/mysql-test/main/mysql_binary_zero_insert.result
@@ -2133,6 +2225,9 @@ share/mysql-test/main/mysql_client_test_nonblock.test
 share/mysql-test/main/mysql_comments.result
 share/mysql-test/main/mysql_comments.sql
 share/mysql-test/main/mysql_comments.test
+share/mysql-test/main/mysql_connector_net.ps1
+share/mysql-test/main/mysql_connector_net.result
+share/mysql-test/main/mysql_connector_net.test
 share/mysql-test/main/mysql_cp932.result
 share/mysql-test/main/mysql_cp932.test
 share/mysql-test/main/mysql_delimiter.sql
@@ -2142,12 +2237,10 @@ share/mysql-test/main/mysql_embedded.result
 share/mysql-test/main/mysql_embedded.test
 share/mysql-test/main/mysql_install_db_win.result
 share/mysql-test/main/mysql_install_db_win.test
+share/mysql-test/main/mysql_install_db_win_admin.result
+share/mysql-test/main/mysql_install_db_win_admin.test
 share/mysql-test/main/mysql_install_db_win_utf8.result
 share/mysql-test/main/mysql_install_db_win_utf8.test
-share/mysql-test/main/mysql_json_mysql_upgrade.result
-share/mysql-test/main/mysql_json_mysql_upgrade.test
-share/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.result
-share/mysql-test/main/mysql_json_mysql_upgrade_with_plugin_loaded.test
 share/mysql-test/main/mysql_json_table_recreate.opt
 share/mysql-test/main/mysql_json_table_recreate.result
 share/mysql-test/main/mysql_json_table_recreate.test
@@ -2164,13 +2257,25 @@ share/mysql-test/main/mysql_upgrade-20228.test
 share/mysql-test/main/mysql_upgrade-28915.opt
 share/mysql-test/main/mysql_upgrade-28915.result
 share/mysql-test/main/mysql_upgrade-28915.test
+share/mysql-test/main/mysql_upgrade-34014.opt
+share/mysql-test/main/mysql_upgrade-34014.result
+share/mysql-test/main/mysql_upgrade-34014.test
 share/mysql-test/main/mysql_upgrade-6984.opt
 share/mysql-test/main/mysql_upgrade-6984.result
 share/mysql-test/main/mysql_upgrade-6984.test
+share/mysql-test/main/mysql_upgrade.opt
 share/mysql-test/main/mysql_upgrade.result
 share/mysql-test/main/mysql_upgrade.test
+share/mysql-test/main/mysql_upgrade_file_leak.result
+share/mysql-test/main/mysql_upgrade_file_leak.test
+share/mysql-test/main/mysql_upgrade_mysql_json.result
+share/mysql-test/main/mysql_upgrade_mysql_json.test
 share/mysql-test/main/mysql_upgrade_mysql_json_datatype.result
 share/mysql-test/main/mysql_upgrade_mysql_json_datatype.test
+share/mysql-test/main/mysql_upgrade_mysql_json_system_tables.result
+share/mysql-test/main/mysql_upgrade_mysql_json_system_tables.test
+share/mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.result
+share/mysql-test/main/mysql_upgrade_mysql_json_with_plugin_loaded.test
 share/mysql-test/main/mysql_upgrade_no_innodb.result
 share/mysql-test/main/mysql_upgrade_no_innodb.test
 share/mysql-test/main/mysql_upgrade_noengine.result
@@ -2221,6 +2326,8 @@ share/mysql-test/main/mysqldump-compat-102.test
 share/mysql-test/main/mysqldump-compat.opt
 share/mysql-test/main/mysqldump-compat.result
 share/mysql-test/main/mysqldump-compat.test
+share/mysql-test/main/mysqldump-header.result
+share/mysql-test/main/mysqldump-header.test
 share/mysql-test/main/mysqldump-max-master.opt
 share/mysql-test/main/mysqldump-max.result
 share/mysql-test/main/mysqldump-max.test
@@ -2238,6 +2345,9 @@ share/mysql-test/main/mysqldump-timing.result
 share/mysql-test/main/mysqldump-timing.test
 share/mysql-test/main/mysqldump-utf8mb4.result
 share/mysql-test/main/mysqldump-utf8mb4.test
+share/mysql-test/main/mysqldump-win.opt
+share/mysql-test/main/mysqldump-win.result
+share/mysql-test/main/mysqldump-win.test
 share/mysql-test/main/mysqldump.opt
 share/mysql-test/main/mysqldump.result
 share/mysql-test/main/mysqldump.test
@@ -2250,6 +2360,8 @@ share/mysql-test/main/mysqlshow.test
 share/mysql-test/main/mysqlslap.opt
 share/mysql-test/main/mysqlslap.result
 share/mysql-test/main/mysqlslap.test
+share/mysql-test/main/mysqltest-break.result
+share/mysql-test/main/mysqltest-break.test
 share/mysql-test/main/mysqltest.result
 share/mysql-test/main/mysqltest.test
 share/mysql-test/main/mysqltest_256.result
@@ -2262,6 +2374,8 @@ share/mysql-test/main/mysqltest_tracking_info.result
 share/mysql-test/main/mysqltest_tracking_info.test
 share/mysql-test/main/mysqltest_tracking_info_debug.result
 share/mysql-test/main/mysqltest_tracking_info_debug.test
+share/mysql-test/main/name_const_replacement.result
+share/mysql-test/main/name_const_replacement.test
 share/mysql-test/main/name_resolution_cache_debug.result
 share/mysql-test/main/name_resolution_cache_debug.test
 share/mysql-test/main/named_pipe-master.opt
@@ -2273,7 +2387,7 @@ 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.opt
 share/mysql-test/main/no-threads.result
 share/mysql-test/main/no-threads.test
 share/mysql-test/main/no_binlog.result
@@ -2292,7 +2406,7 @@ share/mysql-test/main/odbc.result
 share/mysql-test/main/odbc.test
 share/mysql-test/main/olap.result
 share/mysql-test/main/olap.test
-share/mysql-test/main/old-mode-master.opt
+share/mysql-test/main/old-mode.opt
 share/mysql-test/main/old-mode.result
 share/mysql-test/main/old-mode.test
 share/mysql-test/main/openssl_1.result
@@ -2311,16 +2425,27 @@ share/mysql-test/main/opt_trace_index_merge_innodb.result
 share/mysql-test/main/opt_trace_index_merge_innodb.test
 share/mysql-test/main/opt_trace_security.result
 share/mysql-test/main/opt_trace_security.test
+share/mysql-test/main/opt_trace_selectivity.result
+share/mysql-test/main/opt_trace_selectivity.test
 share/mysql-test/main/opt_trace_ucs2.result
 share/mysql-test/main/opt_trace_ucs2.test
 share/mysql-test/main/opt_tvc.result
 share/mysql-test/main/opt_tvc.test
+share/mysql-test/main/optimizer_costs.result
+share/mysql-test/main/optimizer_costs.test
+share/mysql-test/main/optimizer_costs2.opt
+share/mysql-test/main/optimizer_costs2.result
+share/mysql-test/main/optimizer_costs2.test
+share/mysql-test/main/optimizer_crash.result
+share/mysql-test/main/optimizer_crash.test
 share/mysql-test/main/order_by-mdev-10122.result
 share/mysql-test/main/order_by-mdev-10122.test
 share/mysql-test/main/order_by.result
 share/mysql-test/main/order_by.test
 share/mysql-test/main/order_by_innodb.result
 share/mysql-test/main/order_by_innodb.test
+share/mysql-test/main/order_by_limit_join.result
+share/mysql-test/main/order_by_limit_join.test
 share/mysql-test/main/order_by_optimizer.result
 share/mysql-test/main/order_by_optimizer.test
 share/mysql-test/main/order_by_optimizer_innodb.result
@@ -2395,12 +2520,16 @@ share/mysql-test/main/partition_exchange.result
 share/mysql-test/main/partition_exchange.test
 share/mysql-test/main/partition_explicit_prune.result
 share/mysql-test/main/partition_explicit_prune.test
+share/mysql-test/main/partition_geometries.result
+share/mysql-test/main/partition_geometries.test
 share/mysql-test/main/partition_grant.result
 share/mysql-test/main/partition_grant.test
 share/mysql-test/main/partition_hash.result
 share/mysql-test/main/partition_hash.test
 share/mysql-test/main/partition_innodb.result
 share/mysql-test/main/partition_innodb.test
+share/mysql-test/main/partition_innodb2.result
+share/mysql-test/main/partition_innodb2.test
 share/mysql-test/main/partition_innodb_plugin.result
 share/mysql-test/main/partition_innodb_plugin.test
 share/mysql-test/main/partition_innodb_semi_consistent-master.opt
@@ -2555,6 +2684,8 @@ share/mysql-test/main/ps_innodb.result
 share/mysql-test/main/ps_innodb.test
 share/mysql-test/main/ps_max_subselect-5113.result
 share/mysql-test/main/ps_max_subselect-5113.test
+share/mysql-test/main/ps_mem_leaks.result
+share/mysql-test/main/ps_mem_leaks.test
 share/mysql-test/main/ps_missed_cmds.result
 share/mysql-test/main/ps_missed_cmds.test
 share/mysql-test/main/ps_missed_cmds_bin_prot.result
@@ -2569,6 +2700,10 @@ 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/public_basic.result
+share/mysql-test/main/public_basic.test
+share/mysql-test/main/public_privileges.result
+share/mysql-test/main/public_privileges.test
 share/mysql-test/main/query_cache.result
 share/mysql-test/main/query_cache.test
 share/mysql-test/main/query_cache_28249.result
@@ -2635,6 +2770,9 @@ share/mysql-test/main/replace_returning_err.test
 share/mysql-test/main/require_secure_transport-master.opt
 share/mysql-test/main/require_secure_transport.result
 share/mysql-test/main/require_secure_transport.test
+share/mysql-test/main/require_secure_transport_on.opt
+share/mysql-test/main/require_secure_transport_on.result
+share/mysql-test/main/require_secure_transport_on.test
 share/mysql-test/main/reset_connection.result
 share/mysql-test/main/reset_connection.test
 share/mysql-test/main/rollback.result
@@ -2652,6 +2790,8 @@ share/mysql-test/main/row.result
 share/mysql-test/main/row.test
 share/mysql-test/main/rowid_filter.result
 share/mysql-test/main/rowid_filter.test
+share/mysql-test/main/rowid_filter_aria.result
+share/mysql-test/main/rowid_filter_aria.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
@@ -2668,10 +2808,20 @@ 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/sargable_casefold.result
+share/mysql-test/main/sargable_casefold.test
+share/mysql-test/main/sargable_casefold_notembedded.result
+share/mysql-test/main/sargable_casefold_notembedded.test
+share/mysql-test/main/sargable_casefold_part.result
+share/mysql-test/main/sargable_casefold_part.test
+share/mysql-test/main/sargable_date_cond.result
+share/mysql-test/main/sargable_date_cond.test
 share/mysql-test/main/schema.result
 share/mysql-test/main/schema.test
 share/mysql-test/main/second_frac-9175.result
 share/mysql-test/main/second_frac-9175.test
+share/mysql-test/main/secondary_key_costs.result
+share/mysql-test/main/secondary_key_costs.test
 share/mysql-test/main/secure_file_priv_win-master.opt
 share/mysql-test/main/secure_file_priv_win.result
 share/mysql-test/main/secure_file_priv_win.test
@@ -2701,10 +2851,12 @@ share/mysql-test/main/selectivity_no_engine.result
 share/mysql-test/main/selectivity_no_engine.test
 share/mysql-test/main/selectivity_notembedded.result
 share/mysql-test/main/selectivity_notembedded.test
+share/mysql-test/main/sequence_debug.result
+share/mysql-test/main/sequence_debug.test
 share/mysql-test/main/servers.result
 share/mysql-test/main/servers.test
-share/mysql-test/main/session_tracker_last_gtid.result
-share/mysql-test/main/session_tracker_last_gtid.test
+share/mysql-test/main/session_tracker_sysvar.result
+share/mysql-test/main/session_tracker_sysvar.test
 share/mysql-test/main/set_operation.result
 share/mysql-test/main/set_operation.test
 share/mysql-test/main/set_operation_oracle.result
@@ -2831,6 +2983,12 @@ share/mysql-test/main/sp-no-code.result
 share/mysql-test/main/sp-no-code.test
 share/mysql-test/main/sp-no-valgrind.result
 share/mysql-test/main/sp-no-valgrind.test
+share/mysql-test/main/sp-package-code.result
+share/mysql-test/main/sp-package-code.test
+share/mysql-test/main/sp-package-security.result
+share/mysql-test/main/sp-package-security.test
+share/mysql-test/main/sp-package.result
+share/mysql-test/main/sp-package.test
 share/mysql-test/main/sp-prelocking.result
 share/mysql-test/main/sp-prelocking.test
 share/mysql-test/main/sp-row-vs-var.inc
@@ -2838,6 +2996,8 @@ share/mysql-test/main/sp-row.result
 share/mysql-test/main/sp-row.test
 share/mysql-test/main/sp-security-anchor-type.result
 share/mysql-test/main/sp-security-anchor-type.test
+share/mysql-test/main/sp-security-debug.result
+share/mysql-test/main/sp-security-debug.test
 share/mysql-test/main/sp-security.result
 share/mysql-test/main/sp-security.test
 share/mysql-test/main/sp-threads.result
@@ -2864,6 +3024,8 @@ share/mysql-test/main/sp_trans.result
 share/mysql-test/main/sp_trans.test
 share/mysql-test/main/sp_trans_log.result
 share/mysql-test/main/sp_trans_log.test
+share/mysql-test/main/sp_validation.result
+share/mysql-test/main/sp_validation.test
 share/mysql-test/main/sql_mode.result
 share/mysql-test/main/sql_mode.test
 share/mysql-test/main/sql_mode_pad_char_to_full_length.result
@@ -2884,6 +3046,10 @@ share/mysql-test/main/ssl_8k_key.result
 share/mysql-test/main/ssl_8k_key.test
 share/mysql-test/main/ssl_and_innodb.result
 share/mysql-test/main/ssl_and_innodb.test
+share/mysql-test/main/ssl_autoverify,win.rdiff
+share/mysql-test/main/ssl_autoverify.combinations
+share/mysql-test/main/ssl_autoverify.result
+share/mysql-test/main/ssl_autoverify.test
 share/mysql-test/main/ssl_ca.result
 share/mysql-test/main/ssl_ca.test
 share/mysql-test/main/ssl_cipher.opt
@@ -2898,6 +3064,8 @@ share/mysql-test/main/ssl_crl.result
 share/mysql-test/main/ssl_crl.test
 share/mysql-test/main/ssl_crl_clients.result
 share/mysql-test/main/ssl_crl_clients.test
+share/mysql-test/main/ssl_fp.result
+share/mysql-test/main/ssl_fp.test
 share/mysql-test/main/ssl_system_ca,bad.result
 share/mysql-test/main/ssl_system_ca.combinations
 share/mysql-test/main/ssl_system_ca.result
@@ -2918,6 +3086,8 @@ share/mysql-test/main/stat_tables.result
 share/mysql-test/main/stat_tables.test
 share/mysql-test/main/stat_tables_disabled.result
 share/mysql-test/main/stat_tables_disabled.test
+share/mysql-test/main/stat_tables_flush.result
+share/mysql-test/main/stat_tables_flush.test
 share/mysql-test/main/stat_tables_innodb.result
 share/mysql-test/main/stat_tables_innodb.test
 share/mysql-test/main/stat_tables_innodb_debug.result
@@ -2958,6 +3128,8 @@ share/mysql-test/main/status2.result
 share/mysql-test/main/status2.test
 share/mysql-test/main/status_bug17954.result
 share/mysql-test/main/status_bug17954.test
+share/mysql-test/main/status_debug.result
+share/mysql-test/main/status_debug.test
 share/mysql-test/main/str_to_datetime_457.result
 share/mysql-test/main/str_to_datetime_457.test
 share/mysql-test/main/strict-master.opt
@@ -2988,6 +3160,8 @@ share/mysql-test/main/subselect_cache.result
 share/mysql-test/main/subselect_cache.test
 share/mysql-test/main/subselect_debug.result
 share/mysql-test/main/subselect_debug.test
+share/mysql-test/main/subselect_elimination.result
+share/mysql-test/main/subselect_elimination.test
 share/mysql-test/main/subselect_exists2in.result
 share/mysql-test/main/subselect_exists2in.test
 share/mysql-test/main/subselect_exists2in_costmat.result
@@ -2996,13 +3170,17 @@ share/mysql-test/main/subselect_extra.result
 share/mysql-test/main/subselect_extra.test
 share/mysql-test/main/subselect_extra_no_semijoin.result
 share/mysql-test/main/subselect_extra_no_semijoin.test
+share/mysql-test/main/subselect_firstmatch.result
+share/mysql-test/main/subselect_firstmatch.test
 share/mysql-test/main/subselect_gis.result
 share/mysql-test/main/subselect_gis.test
 share/mysql-test/main/subselect_innodb.result
 share/mysql-test/main/subselect_innodb.test
 share/mysql-test/main/subselect_mat.result
 share/mysql-test/main/subselect_mat.test
-share/mysql-test/main/subselect_mat_cost-master.opt
+share/mysql-test/main/subselect_mat_analyze_json.result
+share/mysql-test/main/subselect_mat_analyze_json.test
+share/mysql-test/main/subselect_mat_cost.opt
 share/mysql-test/main/subselect_mat_cost.result
 share/mysql-test/main/subselect_mat_cost.test
 share/mysql-test/main/subselect_mat_cost_bugs.result
@@ -3021,6 +3199,8 @@ share/mysql-test/main/subselect_notembedded.result
 share/mysql-test/main/subselect_notembedded.test
 share/mysql-test/main/subselect_nulls.result
 share/mysql-test/main/subselect_nulls.test
+share/mysql-test/main/subselect_nulls_innodb.result
+share/mysql-test/main/subselect_nulls_innodb.test
 share/mysql-test/main/subselect_partial_match.result
 share/mysql-test/main/subselect_partial_match.test
 share/mysql-test/main/subselect_sj.result
@@ -3126,9 +3306,8 @@ share/mysql-test/main/timezone_grant.test
 share/mysql-test/main/tls_version.opt
 share/mysql-test/main/tls_version.result
 share/mysql-test/main/tls_version.test
-share/mysql-test/main/tls_version1.opt
-share/mysql-test/main/tls_version1.result
-share/mysql-test/main/tls_version1.test
+share/mysql-test/main/tlsv13.result
+share/mysql-test/main/tlsv13.test
 share/mysql-test/main/tmp_table_count-7586.result
 share/mysql-test/main/tmp_table_count-7586.test
 share/mysql-test/main/tmp_table_error.result
@@ -3171,6 +3350,10 @@ share/mysql-test/main/type_bit_innodb.result
 share/mysql-test/main/type_bit_innodb.test
 share/mysql-test/main/type_blob.result
 share/mysql-test/main/type_blob.test
+share/mysql-test/main/type_bool.result
+share/mysql-test/main/type_bool.test
+share/mysql-test/main/type_char.result
+share/mysql-test/main/type_char.test
 share/mysql-test/main/type_date.result
 share/mysql-test/main/type_date.test
 share/mysql-test/main/type_date_round.result
@@ -3266,12 +3449,16 @@ share/mysql-test/main/unique.result
 share/mysql-test/main/unique.test
 share/mysql-test/main/unsafe_binlog_innodb.result
 share/mysql-test/main/unsafe_binlog_innodb.test
+share/mysql-test/main/unusable_keys_joins.inc
+share/mysql-test/main/unusable_keys_literals.inc
 share/mysql-test/main/update.result
 share/mysql-test/main/update.test
 share/mysql-test/main/update_ignore_216.result
 share/mysql-test/main/update_ignore_216.test
 share/mysql-test/main/update_innodb.result
 share/mysql-test/main/update_innodb.test
+share/mysql-test/main/update_single_to_multi.result
+share/mysql-test/main/update_single_to_multi.test
 share/mysql-test/main/update_use_source.result
 share/mysql-test/main/update_use_source.test
 share/mysql-test/main/upgrade.opt
@@ -3302,7 +3489,7 @@ share/mysql-test/main/userstat.test
 share/mysql-test/main/varbinary.result
 share/mysql-test/main/varbinary.test
 share/mysql-test/main/variables-master.opt
-share/mysql-test/main/variables-notembedded-master.opt
+share/mysql-test/main/variables-notembedded.opt
 share/mysql-test/main/variables-notembedded.result
 share/mysql-test/main/variables-notembedded.test
 share/mysql-test/main/variables.result
@@ -3408,6 +3595,7 @@ share/mysql-test/plugin/connect/connect/my.cnf
 share/mysql-test/plugin/connect/connect/r/
 share/mysql-test/plugin/connect/connect/r/alter.result
 share/mysql-test/plugin/connect/connect/r/alter_engine.result
+share/mysql-test/plugin/connect/connect/r/alter_not_embedded.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
@@ -3495,8 +3683,6 @@ share/mysql-test/plugin/connect/connect/r/xml_mult.result
 share/mysql-test/plugin/connect/connect/r/xml_zip.result
 share/mysql-test/plugin/connect/connect/r/zip.result
 share/mysql-test/plugin/connect/connect/std_data/
-share/mysql-test/plugin/connect/connect/std_data/JavaWrappers.jar
-share/mysql-test/plugin/connect/connect/std_data/JdbcMariaDB.jar
 share/mysql-test/plugin/connect/connect/std_data/Mongo2.jar
 share/mysql-test/plugin/connect/connect/std_data/Mongo3.jar
 share/mysql-test/plugin/connect/connect/std_data/Testbal.dat
@@ -3538,6 +3724,7 @@ share/mysql-test/plugin/connect/connect/suite.pm
 share/mysql-test/plugin/connect/connect/t/
 share/mysql-test/plugin/connect/connect/t/alter.test
 share/mysql-test/plugin/connect/connect/t/alter_engine.test
+share/mysql-test/plugin/connect/connect/t/alter_not_embedded.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
@@ -3707,6 +3894,7 @@ 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.opt
 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
@@ -4064,8 +4252,6 @@ share/mysql-test/plugin/spider/spider/bugfix/include/slave_transaction_retry_err
 share/mysql-test/plugin/spider/spider/bugfix/include/slave_transaction_retry_errors_5digit_init.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/slave_trx_isolation_deinit.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/slave_trx_isolation_init.inc
-share/mysql-test/plugin/spider/spider/bugfix/include/spider_table_sts_deinit.inc
-share/mysql-test/plugin/spider/spider/bugfix/include/spider_table_sts_init.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/sql_mode_deinit.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/sql_mode_init.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/sql_mode_mariadb_deinit.inc
@@ -4092,11 +4278,13 @@ share/mysql-test/plugin/spider/spider/bugfix/my_4_1.cnf
 share/mysql-test/plugin/spider/spider/bugfix/r/
 share/mysql-test/plugin/spider/spider/bugfix/r/checksum_table_with_quick_mode_3.result
 share/mysql-test/plugin/spider/spider/bugfix/r/cp932_column.result
+share/mysql-test/plugin/spider/spider/bugfix/r/ddl_log.result
 share/mysql-test/plugin/spider/spider/bugfix/r/delete_with_float_column_default.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/gbh_outer_fields_in_join.result
 share/mysql-test/plugin/spider/spider/bugfix/r/group_by_order_by_limit.result
 share/mysql-test/plugin/spider/spider/bugfix/r/index.result
 share/mysql-test/plugin/spider/spider/bugfix/r/insert_select.result
@@ -4106,6 +4294,7 @@ 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/mdev_22265.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_22979.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_24020.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_24343.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_24517.result
@@ -4114,32 +4303,100 @@ share/mysql-test/plugin/spider/spider/bugfix/r/mdev_24760.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_25116.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_25684.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26013.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26151.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26158.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26247.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26345.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26539.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_26541.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_27186.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27233.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_27575.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27902.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28105.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28218.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28218_init_file.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28218_mixed.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28683.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28739.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28739_simple.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28854.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28856.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28996.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28998.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29002.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/mdev_29027.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29027_original.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29163.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29352.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29421.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29447.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29456.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29484.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29502.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29562.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29644.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29653.result
-share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29855.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29667.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29676.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29904.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29962.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29963.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30014.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30067.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30170.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30191.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30370.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30392.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30408.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30727.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_30981.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31117.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31338.result
-share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31524.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31463.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31475.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31645.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_31996.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32486.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32492.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32683.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32753.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32753_after_start.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32753_after_start_session.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32986.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_32999.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33008.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33191.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33242.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33434.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33441.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33441_fail.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33494.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33538.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33538_fail_init.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33584.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33679.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_33731.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34002.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34003.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34421.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34541.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34555.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34589.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34636.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34659.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_34682.result
+share/mysql-test/plugin/spider/spider/bugfix/r/perfschema.result
+share/mysql-test/plugin/spider/spider/bugfix/r/plugin_load_add_all.result
+share/mysql-test/plugin/spider/spider/bugfix/r/plugin_load_add_spider.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
@@ -4151,12 +4408,17 @@ share/mysql-test/plugin/spider/spider/bugfix/r/select_by_null.result
 share/mysql-test/plugin/spider/spider/bugfix/r/select_with_backquote.result
 share/mysql-test/plugin/spider/spider/bugfix/r/self_reference.result
 share/mysql-test/plugin/spider/spider/bugfix/r/self_reference_multi.result
+share/mysql-test/plugin/spider/spider/bugfix/r/signal_ddl_fail.result
 share/mysql-test/plugin/spider/spider/bugfix/r/slave_transaction_retry_errors_5digit.result
 share/mysql-test/plugin/spider/spider/bugfix/r/slave_trx_isolation.result
-share/mysql-test/plugin/spider/spider/bugfix/r/spider_table_sts.result
+share/mysql-test/plugin/spider/spider/bugfix/r/spider_join_with_non_spider.result
 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/strict_group_by.result
+share/mysql-test/plugin/spider/spider/bugfix/r/subquery.result
+share/mysql-test/plugin/spider/spider/bugfix/r/sysvar_params.result
+share/mysql-test/plugin/spider/spider/bugfix/r/udf_mysql_func_early.result
+share/mysql-test/plugin/spider/spider/bugfix/r/udf_mysql_func_early_init_file.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
@@ -4167,6 +4429,7 @@ share/mysql-test/plugin/spider/spider/bugfix/t/checksum_table_with_quick_mode_3.
 share/mysql-test/plugin/spider/spider/bugfix/t/checksum_table_with_quick_mode_3.test
 share/mysql-test/plugin/spider/spider/bugfix/t/cp932_column.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/cp932_column.test
+share/mysql-test/plugin/spider/spider/bugfix/t/ddl_log.test
 share/mysql-test/plugin/spider/spider/bugfix/t/delete_with_float_column.inc
 share/mysql-test/plugin/spider/spider/bugfix/t/delete_with_float_column_default.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/delete_with_float_column_default.test
@@ -4178,6 +4441,8 @@ 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/gbh_outer_fields_in_join.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/gbh_outer_fields_in_join.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/index.test
@@ -4195,6 +4460,7 @@ 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/mdev_22265.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_22265.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_22979.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_24020.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_24020.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_24343.cnf
@@ -4211,8 +4477,12 @@ share/mysql-test/plugin/spider/spider/bugfix/t/mdev_25684.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_25684.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26013.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26013.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26151.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26158.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26158.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26247.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26247.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26345.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26539.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26539.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_26541.test
@@ -4224,38 +4494,122 @@ 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_27186.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27186.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27233.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27233.sql
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27233.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27239.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27239.test
 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_27575.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_27902.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28105.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28105.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_init_file.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_init_file.sql
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_init_file.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_mixed.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_mixed.sql
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28218_mixed.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28683.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28739.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28739.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28739_simple.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_28856.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28996.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28996.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_28998.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29002.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/mdev_29027.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29027.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29027_original.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29163.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29352.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29421.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29447.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29447.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29456.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29484.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29484.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29502.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29562.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29562.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29644.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29644.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29653.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29653.test
-share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29855.cnf
-share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29855.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29667.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29667.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29676.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29904.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29962.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_29963.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30014.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30067.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30170.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30191.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30191.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30370.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30392.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30408.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30727.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_30981.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31117.test
 share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31338.test
-share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31524.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31463.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31463.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31475.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31645.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_31996.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32486.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32492.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32683.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32753.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32753.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32753_after_start.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32753_after_start.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32753_after_start_session.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32986.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_32999.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33008.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33191.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33242.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33434.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33441.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33441.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33441_fail.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33441_fail.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33494.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33538.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33538.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33538_fail_init.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33584.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33679.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_33731.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34002.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34003.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34421.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34541.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34555.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34589.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34636.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34659.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_34682.test
+share/mysql-test/plugin/spider/spider/bugfix/t/perfschema.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/perfschema.test
+share/mysql-test/plugin/spider/spider/bugfix/t/plugin_load_add_all.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/plugin_load_add_all.test
+share/mysql-test/plugin/spider/spider/bugfix/t/plugin_load_add_spider.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/plugin_load_add_spider.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
@@ -4277,12 +4631,13 @@ share/mysql-test/plugin/spider/spider/bugfix/t/select_with_backquote.test
 share/mysql-test/plugin/spider/spider/bugfix/t/self_reference.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/self_reference.test
 share/mysql-test/plugin/spider/spider/bugfix/t/self_reference_multi.test
+share/mysql-test/plugin/spider/spider/bugfix/t/signal_ddl_fail.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/signal_ddl_fail.test
 share/mysql-test/plugin/spider/spider/bugfix/t/slave_transaction_retry_errors_5digit.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/slave_transaction_retry_errors_5digit.test
 share/mysql-test/plugin/spider/spider/bugfix/t/slave_trx_isolation.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/slave_trx_isolation.test
-share/mysql-test/plugin/spider/spider/bugfix/t/spider_table_sts.cnf
-share/mysql-test/plugin/spider/spider/bugfix/t/spider_table_sts.test
+share/mysql-test/plugin/spider/spider/bugfix/t/spider_join_with_non_spider.test
 share/mysql-test/plugin/spider/spider/bugfix/t/sql_mode.inc
 share/mysql-test/plugin/spider/spider/bugfix/t/sql_mode_mariadb.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/sql_mode_mariadb.test
@@ -4290,6 +4645,15 @@ share/mysql-test/plugin/spider/spider/bugfix/t/sql_mode_mysql.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/sql_mode_mysql.test
 share/mysql-test/plugin/spider/spider/bugfix/t/strict_group_by.cnf
 share/mysql-test/plugin/spider/spider/bugfix/t/strict_group_by.test
+share/mysql-test/plugin/spider/spider/bugfix/t/subquery.test
+share/mysql-test/plugin/spider/spider/bugfix/t/sysvar_params.test
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early.test
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early_init_file.cnf
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early_init_file.opt
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early_init_file.sql
+share/mysql-test/plugin/spider/spider/bugfix/t/udf_mysql_func_early_init_file.test
 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
@@ -4322,6 +4686,8 @@ share/mysql-test/plugin/spider/spider/feature/r/checksum_table_parallel_extended
 share/mysql-test/plugin/spider/spider/feature/r/checksum_table_parallel_no_opt.result
 share/mysql-test/plugin/spider/spider/feature/r/checksum_table_parallel_quick.result
 share/mysql-test/plugin/spider/spider/feature/r/engine_defined_attributes.result
+share/mysql-test/plugin/spider/spider/feature/r/pushdown_case.result
+share/mysql-test/plugin/spider/spider/feature/r/pushdown_timestamp_diff.result
 share/mysql-test/plugin/spider/spider/feature/r/slave_transaction_retry_errors.result
 share/mysql-test/plugin/spider/spider/feature/suite.opt
 share/mysql-test/plugin/spider/spider/feature/suite.pm
@@ -4335,101 +4701,10 @@ share/mysql-test/plugin/spider/spider/feature/t/checksum_table_parallel_quick.cn
 share/mysql-test/plugin/spider/spider/feature/t/checksum_table_parallel_quick.test
 share/mysql-test/plugin/spider/spider/feature/t/engine_defined_attributes.cnf
 share/mysql-test/plugin/spider/spider/feature/t/engine_defined_attributes.test
+share/mysql-test/plugin/spider/spider/feature/t/pushdown_case.test
+share/mysql-test/plugin/spider/spider/feature/t/pushdown_timestamp_diff.test
 share/mysql-test/plugin/spider/spider/feature/t/slave_transaction_retry_errors.cnf
 share/mysql-test/plugin/spider/spider/feature/t/slave_transaction_retry_errors.test
-share/mysql-test/plugin/spider/spider/handler/
-share/mysql-test/plugin/spider/spider/handler/include/
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/deinit_slave1_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child3_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child3_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_child3_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child3_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child3_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_child3_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/ha_init_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_deinit_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_deinit_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_deinit_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_deinit_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_init_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_init_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_init_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/hs_init_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child3_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child3_2.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_child3_3.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/include/init_slave1_1.inc
-share/mysql-test/plugin/spider/spider/handler/my.cnf
-share/mysql-test/plugin/spider/spider/handler/r/
-share/mysql-test/plugin/spider/spider/handler/r/basic_sql.result
-share/mysql-test/plugin/spider/spider/handler/r/basic_sql_part.result
-share/mysql-test/plugin/spider/spider/handler/r/direct_aggregate.result
-share/mysql-test/plugin/spider/spider/handler/r/direct_aggregate_part.result
-share/mysql-test/plugin/spider/spider/handler/r/direct_update.result
-share/mysql-test/plugin/spider/spider/handler/r/direct_update_part.result
-share/mysql-test/plugin/spider/spider/handler/r/function.result
-share/mysql-test/plugin/spider/spider/handler/r/ha.result
-share/mysql-test/plugin/spider/spider/handler/r/ha_part.result
-share/mysql-test/plugin/spider/spider/handler/r/spider3_fixes.result
-share/mysql-test/plugin/spider/spider/handler/r/spider3_fixes_part.result
-share/mysql-test/plugin/spider/spider/handler/r/spider_fixes.result
-share/mysql-test/plugin/spider/spider/handler/r/spider_fixes_part.result
-share/mysql-test/plugin/spider/spider/handler/r/vp_fixes.result
-share/mysql-test/plugin/spider/spider/handler/suite.opt
-share/mysql-test/plugin/spider/spider/handler/suite.pm
-share/mysql-test/plugin/spider/spider/handler/t/
-share/mysql-test/plugin/spider/spider/handler/t/basic_sql.test
-share/mysql-test/plugin/spider/spider/handler/t/basic_sql_part.test
-share/mysql-test/plugin/spider/spider/handler/t/connect_child2_1.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_child2_2.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_child2_3.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_child3_1.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_child3_2.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_child3_3.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_master_1.inc
-share/mysql-test/plugin/spider/spider/handler/t/connect_slave1_1.inc
-share/mysql-test/plugin/spider/spider/handler/t/direct_aggregate.test
-share/mysql-test/plugin/spider/spider/handler/t/direct_aggregate_part.test
-share/mysql-test/plugin/spider/spider/handler/t/direct_update.test
-share/mysql-test/plugin/spider/spider/handler/t/direct_update_part.test
-share/mysql-test/plugin/spider/spider/handler/t/function.test
-share/mysql-test/plugin/spider/spider/handler/t/ha.test
-share/mysql-test/plugin/spider/spider/handler/t/ha_part.test
-share/mysql-test/plugin/spider/spider/handler/t/ha_test_deinit.inc
-share/mysql-test/plugin/spider/spider/handler/t/ha_test_init.inc
-share/mysql-test/plugin/spider/spider/handler/t/have_engine.inc
-share/mysql-test/plugin/spider/spider/handler/t/have_func.inc
-share/mysql-test/plugin/spider/spider/handler/t/have_partition.inc
-share/mysql-test/plugin/spider/spider/handler/t/have_trigger.inc
-share/mysql-test/plugin/spider/spider/handler/t/hs_test_deinit.inc
-share/mysql-test/plugin/spider/spider/handler/t/hs_test_init.inc
-share/mysql-test/plugin/spider/spider/handler/t/slave_test_deinit.inc
-share/mysql-test/plugin/spider/spider/handler/t/slave_test_init.inc
-share/mysql-test/plugin/spider/spider/handler/t/spider3_fixes.test
-share/mysql-test/plugin/spider/spider/handler/t/spider3_fixes_part.test
-share/mysql-test/plugin/spider/spider/handler/t/spider_fixes.test
-share/mysql-test/plugin/spider/spider/handler/t/spider_fixes_part.test
-share/mysql-test/plugin/spider/spider/handler/t/test_deinit.inc
-share/mysql-test/plugin/spider/spider/handler/t/test_init.inc
-share/mysql-test/plugin/spider/spider/handler/t/vp_fixes.test
 share/mysql-test/plugin/spider/spider/include/
 share/mysql-test/plugin/spider/spider/include/checksum_table_with_quick_mode_3_deinit.inc
 share/mysql-test/plugin/spider/spider/include/checksum_table_with_quick_mode_3_init.inc
@@ -4517,11 +4792,20 @@ 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/my_1_1.cnf
+share/mysql-test/plugin/spider/spider/my_2_1.cnf
+share/mysql-test/plugin/spider/spider/my_2_2.cnf
+share/mysql-test/plugin/spider/spider/my_2_3.cnf
+share/mysql-test/plugin/spider/spider/my_3_1.cnf
+share/mysql-test/plugin/spider/spider/my_3_2.cnf
+share/mysql-test/plugin/spider/spider/my_3_3.cnf
+share/mysql-test/plugin/spider/spider/my_4_1.cnf
 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
 share/mysql-test/plugin/spider/spider/r/basic_sql_part.result
 share/mysql-test/plugin/spider/spider/r/checksum_table_with_quick_mode_3.result
+share/mysql-test/plugin/spider/spider/r/connection_override.result
 share/mysql-test/plugin/spider/spider/r/direct_aggregate.result
 share/mysql-test/plugin/spider/spider/r/direct_aggregate_part.result
 share/mysql-test/plugin/spider/spider/r/direct_join.result
@@ -4671,6 +4955,8 @@ share/mysql-test/plugin/spider/spider/t/connect_child3_2.inc
 share/mysql-test/plugin/spider/spider/t/connect_child3_3.inc
 share/mysql-test/plugin/spider/spider/t/connect_master_1.inc
 share/mysql-test/plugin/spider/spider/t/connect_slave1_1.inc
+share/mysql-test/plugin/spider/spider/t/connection_override.cnf
+share/mysql-test/plugin/spider/spider/t/connection_override.test
 share/mysql-test/plugin/spider/spider/t/direct_aggregate.test
 share/mysql-test/plugin/spider/spider/t/direct_aggregate_part.test
 share/mysql-test/plugin/spider/spider/t/direct_join.test
@@ -4714,6 +5000,7 @@ share/mysql-test/plugin/spider/spider/t/slave_trx_isolation.test
 share/mysql-test/plugin/spider/spider/t/spider3_fixes.test
 share/mysql-test/plugin/spider/spider/t/spider3_fixes_part.test
 share/mysql-test/plugin/spider/spider/t/spider_fixes.test
+share/mysql-test/plugin/spider/spider/t/spider_fixes_part.opt
 share/mysql-test/plugin/spider/spider/t/spider_fixes_part.test
 share/mysql-test/plugin/spider/spider/t/spider_wrapper_protocols.test
 share/mysql-test/plugin/spider/spider/t/test_deinit.inc
@@ -4744,19 +5031,68 @@ share/mysql-test/plugin/test_sql_discovery/sql_discovery/simple.test
 share/mysql-test/plugin/test_sql_discovery/sql_discovery/suite.pm
 share/mysql-test/plugin/type_inet/
 share/mysql-test/plugin/type_inet/type_inet/
+share/mysql-test/plugin/type_inet/type_inet/binlog_stm_type_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/binlog_stm_type_inet4.test
 share/mysql-test/plugin/type_inet/type_inet/binlog_stm_type_inet6.result
 share/mysql-test/plugin/type_inet/type_inet/binlog_stm_type_inet6.test
+share/mysql-test/plugin/type_inet/type_inet/binlog_table_map_optional_metadata_type_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/binlog_table_map_optional_metadata_type_inet4.test
 share/mysql-test/plugin/type_inet/type_inet/binlog_table_map_optional_metadata_type_inet6.result
 share/mysql-test/plugin/type_inet/type_inet/binlog_table_map_optional_metadata_type_inet6.test
 share/mysql-test/plugin/type_inet/type_inet/func_inet_plugin.result
 share/mysql-test/plugin/type_inet/type_inet/func_inet_plugin.test
+share/mysql-test/plugin/type_inet/type_inet/rpl_row_binary_to_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/rpl_row_binary_to_inet4.test
 share/mysql-test/plugin/type_inet/type_inet/rpl_row_binary_to_inet6.result
 share/mysql-test/plugin/type_inet/type_inet/rpl_row_binary_to_inet6.test
+share/mysql-test/plugin/type_inet/type_inet/rpl_row_inet4_to_binary.result
+share/mysql-test/plugin/type_inet/type_inet/rpl_row_inet4_to_binary.test
 share/mysql-test/plugin/type_inet/type_inet/rpl_row_inet6_to_binary.result
 share/mysql-test/plugin/type_inet/type_inet/rpl_row_inet6_to_binary.test
+share/mysql-test/plugin/type_inet/type_inet/rpl_type_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/rpl_type_inet4.test
 share/mysql-test/plugin/type_inet/type_inet/rpl_type_inet6.result
 share/mysql-test/plugin/type_inet/type_inet/rpl_type_inet6.test
 share/mysql-test/plugin/type_inet/type_inet/suite.pm
+share/mysql-test/plugin/type_inet/type_inet/type_inet4-debug.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4-debug.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_csv.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_csv.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_engines.inc
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_innodb.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_innodb.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_memory.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_memory.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_date.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_date.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_datetime.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_datetime.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_decimal.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_decimal.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_double.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_double.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_int.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_int.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_time.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_time.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_timestamp.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_timestamp.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_year.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mix_year.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_myisam.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_myisam.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mysql.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_mysql.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_oracle.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_oracle.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_partition.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_partition.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_plugin.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_plugin.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_stat_tables.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet4_stat_tables.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6-debug.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6-debug.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6.result
@@ -4776,6 +5112,8 @@ share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_double_loose.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_double_loose.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_double_strict_ignore.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_double_strict_ignore.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_inet4.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_inet4.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_int.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_int.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_mix_json.result
@@ -4794,6 +5132,8 @@ share/mysql-test/plugin/type_inet/type_inet/type_inet6_partition.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_partition.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_plugin.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_plugin.test
+share/mysql-test/plugin/type_inet/type_inet/type_inet6_search_condition.result
+share/mysql-test/plugin/type_inet/type_inet/type_inet6_search_condition.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_stat_tables.result
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_stat_tables.test
 share/mysql-test/plugin/type_inet/type_inet/type_inet6_sum.result
@@ -4852,6 +5192,8 @@ share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_csv.test
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_engines.inc
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_innodb.result
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_innodb.test
+share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_mariadb101104.result
+share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_mariadb101104.test
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_memory.result
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_memory.test
 share/mysql-test/plugin/type_uuid/type_uuid/type_uuid_mix_decimal.result
@@ -4895,6 +5237,8 @@ share/mysql-test/purify.supp
 share/mysql-test/std_data/
 share/mysql-test/std_data/14897.frm
 share/mysql-test/std_data/Moscow_leap
+share/mysql-test/std_data/autoinc_import_101.frm
+share/mysql-test/std_data/autoinc_import_57.frm
 share/mysql-test/std_data/bad2_master.info
 share/mysql-test/std_data/bad3_master.info
 share/mysql-test/std_data/bad4_master.info
@@ -4933,7 +5277,6 @@ share/mysql-test/std_data/bug46565.frm
 share/mysql-test/std_data/bug47012.ARM
 share/mysql-test/std_data/bug47012.ARZ
 share/mysql-test/std_data/bug47012.frm
-share/mysql-test/std_data/bug47142_master-bin.000001
 share/mysql-test/std_data/bug47205.frm
 share/mysql-test/std_data/bug48265.frm
 share/mysql-test/std_data/bug48449.frm
@@ -5073,7 +5416,7 @@ share/mysql-test/std_data/mariadb53_temporal/
 share/mysql-test/std_data/mariadb53_temporal/mariadb5312_datetime.frm
 share/mysql-test/std_data/mariadb53_temporal/mariadb5312_time.frm
 share/mysql-test/std_data/mariadb53_temporal/mariadb5312_timestamp.frm
-share/mysql-test/std_data/master-bin.000001
+share/mysql-test/std_data/mdev-25731.dat
 share/mysql-test/std_data/mdev-4645-binlog_checksum.binlog
 share/mysql-test/std_data/mdev-4645-binlog_group_id.binlog
 share/mysql-test/std_data/mdev-4645-binlog_group_id_checksum.binlog
@@ -5156,6 +5499,7 @@ 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/mysql57part.frm
 share/mysql-test/std_data/mysql57user.MYD
 share/mysql-test/std_data/mysql57user.MYI
 share/mysql-test/std_data/mysql57user.frm
@@ -5166,6 +5510,8 @@ share/mysql-test/std_data/mysql80/ibdata1_4096
 share/mysql-test/std_data/mysql80/ibdata1_65536
 share/mysql-test/std_data/mysql80/ibdata1_8192
 share/mysql-test/std_data/mysql80/t1.ibd
+share/mysql-test/std_data/mysql80/t2.cfg
+share/mysql-test/std_data/mysql80/t2.ibd
 share/mysql-test/std_data/mysql_database_10.0.dump
 share/mysql-test/std_data/mysql_database_10.1.dump
 share/mysql-test/std_data/mysql_database_10.2.dump
@@ -5260,8 +5606,8 @@ share/mysql-test/std_data/temporal_upgrade/mysql050614_temporal0.frm
 share/mysql-test/std_data/temporal_upgrade/mysql050614_temporal1.MYD
 share/mysql-test/std_data/temporal_upgrade/mysql050614_temporal1.MYI
 share/mysql-test/std_data/temporal_upgrade/mysql050614_temporal1.frm
-share/mysql-test/std_data/trunc_binlog.000001
 share/mysql-test/std_data/unicode/
+share/mysql-test/std_data/unicode/allkeys1400.txt
 share/mysql-test/std_data/unicode/allkeys400.txt
 share/mysql-test/std_data/unicode/allkeys520.txt
 share/mysql-test/std_data/untrusted-cacert.pem
@@ -5349,6 +5695,7 @@ share/mysql-test/suite/atomic/create_trigger2.result
 share/mysql-test/suite/atomic/create_trigger2.test
 share/mysql-test/suite/atomic/create_view.result
 share/mysql-test/suite/atomic/create_view.test
+share/mysql-test/suite/atomic/disabled.def
 share/mysql-test/suite/atomic/drop_db.result
 share/mysql-test/suite/atomic/drop_db.test
 share/mysql-test/suite/atomic/drop_db_long_names.opt
@@ -5399,7 +5746,6 @@ share/mysql-test/suite/binlog/include/blackhole.test
 share/mysql-test/suite/binlog/include/check_binlog_size.inc
 share/mysql-test/suite/binlog/include/ctype_cp932.test
 share/mysql-test/suite/binlog/include/ctype_cp932_binlog.test
-share/mysql-test/suite/binlog/include/ctype_ucs_binlog.result
 share/mysql-test/suite/binlog/include/ctype_ucs_binlog.test
 share/mysql-test/suite/binlog/include/database.test
 share/mysql-test/suite/binlog/include/drop_table.test
@@ -5412,6 +5758,8 @@ share/mysql-test/suite/binlog/include/mysqlbinlog_gtid_strict_mode.inc
 share/mysql-test/suite/binlog/include/mysqlbinlog_gtid_window_test_cases.inc
 share/mysql-test/suite/binlog/include/mysqlbinlog_row_engine.inc
 share/mysql-test/suite/binlog/include/print_optional_metadata.inc
+share/mysql-test/suite/binlog/include/row_img.test
+share/mysql-test/suite/binlog/my.cnf
 share/mysql-test/suite/binlog/r/
 share/mysql-test/suite/binlog/r/backup.result
 share/mysql-test/suite/binlog/r/binlog_1pc.result
@@ -5433,8 +5781,11 @@ share/mysql-test/suite/binlog/r/binlog_expire_logs_seconds.result
 share/mysql-test/suite/binlog/r/binlog_expire_warnings.result
 share/mysql-test/suite/binlog/r/binlog_flush_binlogs_delete_domain.result
 share/mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result
+share/mysql-test/suite/binlog/r/binlog_gis_user_var_stm.result
 share/mysql-test/suite/binlog/r/binlog_grant.result
 share/mysql-test/suite/binlog/r/binlog_gtid_delete_domain_debug.result
+share/mysql-test/suite/binlog/r/binlog_gtid_index.result
+share/mysql-test/suite/binlog/r/binlog_gtid_index_crash.result
 share/mysql-test/suite/binlog/r/binlog_implicit_commit.result
 share/mysql-test/suite/binlog/r/binlog_incident.result
 share/mysql-test/suite/binlog/r/binlog_index.result
@@ -5447,6 +5798,7 @@ share/mysql-test/suite/binlog/r/binlog_killed.result
 share/mysql-test/suite/binlog/r/binlog_killed_simulate.result
 share/mysql-test/suite/binlog/r/binlog_max_binlog_stmt_cache_size.result
 share/mysql-test/suite/binlog/r/binlog_max_extension.result
+share/mysql-test/suite/binlog/r/binlog_mdev25611.result
 share/mysql-test/suite/binlog/r/binlog_mdev342.result
 share/mysql-test/suite/binlog/r/binlog_mdev717.result
 share/mysql-test/suite/binlog/r/binlog_mixed.result
@@ -5468,8 +5820,8 @@ share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_row_trans.result
 share/mysql-test/suite/binlog/r/binlog_mysqlbinlog_start_alter_verbose.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_mysqlbinlog_warn_stop_datetime.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_ddl.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
@@ -5483,6 +5835,7 @@ share/mysql-test/suite/binlog/r/binlog_row_ctype_cp932.result
 share/mysql-test/suite/binlog/r/binlog_row_ctype_ucs.result
 share/mysql-test/suite/binlog/r/binlog_row_drop_tbl.result
 share/mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
+share/mysql-test/suite/binlog/r/binlog_row_img.result
 share/mysql-test/suite/binlog/r/binlog_row_insert_select.result
 share/mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
 share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result
@@ -5491,6 +5844,7 @@ share/mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_verbose.result
 share/mysql-test/suite/binlog/r/binlog_server_id.result
 share/mysql-test/suite/binlog/r/binlog_sf.result
 share/mysql-test/suite/binlog/r/binlog_show_binlog_event_random_pos.result
+share/mysql-test/suite/binlog/r/binlog_show_binlog_events_invalid_offset_silent.result
 share/mysql-test/suite/binlog/r/binlog_spurious_ddl_errors.result
 share/mysql-test/suite/binlog/r/binlog_sql_mode.result
 share/mysql-test/suite/binlog/r/binlog_start_comment.result
@@ -5506,6 +5860,7 @@ share/mysql-test/suite/binlog/r/binlog_stm_drop_tbl.result
 share/mysql-test/suite/binlog/r/binlog_stm_drop_tmp_tbl.result
 share/mysql-test/suite/binlog/r/binlog_stm_insert_select.result
 share/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
+share/mysql-test/suite/binlog/r/binlog_stm_mysqlbinlog_collate_implicit.result
 share/mysql-test/suite/binlog/r/binlog_stm_ps.result
 share/mysql-test/suite/binlog/r/binlog_stm_row.result
 share/mysql-test/suite/binlog/r/binlog_stm_sp.result
@@ -5546,6 +5901,7 @@ share/mysql-test/suite/binlog/r/foreign_key.result
 share/mysql-test/suite/binlog/r/innodb_autoinc_lock_mode_binlog.result
 share/mysql-test/suite/binlog/r/innodb_rc_insert_before_delete.result
 share/mysql-test/suite/binlog/r/load_data_stm_view.result
+share/mysql-test/suite/binlog/r/max_binlog_total_size.result
 share/mysql-test/suite/binlog/r/mysqladmin.result
 share/mysql-test/suite/binlog/r/read_only.result
 share/mysql-test/suite/binlog/r/read_only_statement.result
@@ -5553,14 +5909,8 @@ share/mysql-test/suite/binlog/r/show_concurrent_rotate.result
 share/mysql-test/suite/binlog/r/start_alter_mysqlbinlog_replay.result
 share/mysql-test/suite/binlog/r/temptable_uservar_disconnect-7938.result
 share/mysql-test/suite/binlog/std_data/
-share/mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001
-share/mysql-test/suite/binlog/std_data/bug32407.001
 share/mysql-test/suite/binlog/std_data/update-full-row.binlog
 share/mysql-test/suite/binlog/std_data/update-partial-row.binlog
-share/mysql-test/suite/binlog/std_data/ver_5_1-telco.001
-share/mysql-test/suite/binlog/std_data/ver_5_1_17.001
-share/mysql-test/suite/binlog/std_data/ver_5_1_23.001
-share/mysql-test/suite/binlog/std_data/ver_trunk_row_v2.001
 share/mysql-test/suite/binlog/std_data/write-full-row.binlog
 share/mysql-test/suite/binlog/std_data/write-partial-row.binlog
 share/mysql-test/suite/binlog/t/
@@ -5584,11 +5934,16 @@ share/mysql-test/suite/binlog/t/binlog_dmls_on_tmp_tables_readonly.test
 share/mysql-test/suite/binlog/t/binlog_drop_if_exists.test
 share/mysql-test/suite/binlog/t/binlog_empty_xa_prepared.test
 share/mysql-test/suite/binlog/t/binlog_expire_logs_seconds.test
+share/mysql-test/suite/binlog/t/binlog_expire_warnings.opt
 share/mysql-test/suite/binlog/t/binlog_expire_warnings.test
 share/mysql-test/suite/binlog/t/binlog_flush_binlogs_delete_domain.test
 share/mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test
+share/mysql-test/suite/binlog/t/binlog_gis_user_var_stm.test
 share/mysql-test/suite/binlog/t/binlog_grant.test
 share/mysql-test/suite/binlog/t/binlog_gtid_delete_domain_debug.test
+share/mysql-test/suite/binlog/t/binlog_gtid_index.test
+share/mysql-test/suite/binlog/t/binlog_gtid_index_crash.opt
+share/mysql-test/suite/binlog/t/binlog_gtid_index_crash.test
 share/mysql-test/suite/binlog/t/binlog_implicit_commit.test
 share/mysql-test/suite/binlog/t/binlog_incident.test
 share/mysql-test/suite/binlog/t/binlog_index-master.opt
@@ -5606,6 +5961,7 @@ share/mysql-test/suite/binlog/t/binlog_killed_simulate.test
 share/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.opt
 share/mysql-test/suite/binlog/t/binlog_max_binlog_stmt_cache_size.test
 share/mysql-test/suite/binlog/t/binlog_max_extension.test
+share/mysql-test/suite/binlog/t/binlog_mdev25611.test
 share/mysql-test/suite/binlog/t/binlog_mdev342-master.opt
 share/mysql-test/suite/binlog/t/binlog_mdev342.test
 share/mysql-test/suite/binlog/t/binlog_mdev717.test
@@ -5635,8 +5991,8 @@ share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_row_trans.test
 share/mysql-test/suite/binlog/t/binlog_mysqlbinlog_start_alter_verbose.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_mysqlbinlog_warn_stop_datetime.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_ddl.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
@@ -5653,6 +6009,7 @@ share/mysql-test/suite/binlog/t/binlog_row_ctype_cp932.test
 share/mysql-test/suite/binlog/t/binlog_row_ctype_ucs.test
 share/mysql-test/suite/binlog/t/binlog_row_drop_tbl.test
 share/mysql-test/suite/binlog/t/binlog_row_drop_tmp_tbl.test
+share/mysql-test/suite/binlog/t/binlog_row_img.test
 share/mysql-test/suite/binlog/t/binlog_row_innodb_stat-master.opt
 share/mysql-test/suite/binlog/t/binlog_row_insert_select.test
 share/mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam-master.opt
@@ -5665,6 +6022,7 @@ 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_show_binlog_events_invalid_offset_silent.test
 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
@@ -5684,6 +6042,7 @@ share/mysql-test/suite/binlog/t/binlog_stm_innodb_stat-master.opt
 share/mysql-test/suite/binlog/t/binlog_stm_insert_select.test
 share/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt
 share/mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test
+share/mysql-test/suite/binlog/t/binlog_stm_mysqlbinlog_collate_implicit.test
 share/mysql-test/suite/binlog/t/binlog_stm_ps.test
 share/mysql-test/suite/binlog/t/binlog_stm_row.test
 share/mysql-test/suite/binlog/t/binlog_stm_sp.test
@@ -5730,12 +6089,15 @@ share/mysql-test/suite/binlog/t/binlog_xa_recover.test
 share/mysql-test/suite/binlog/t/binlog_xa_recover_using_new_server_id.test
 share/mysql-test/suite/binlog/t/flashback-largebinlog.test
 share/mysql-test/suite/binlog/t/flashback-master.opt
+share/mysql-test/suite/binlog/t/flashback.combinations
 share/mysql-test/suite/binlog/t/flashback.test
 share/mysql-test/suite/binlog/t/foreign_key.test
 share/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.opt
 share/mysql-test/suite/binlog/t/innodb_autoinc_lock_mode_binlog.test
 share/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test
 share/mysql-test/suite/binlog/t/load_data_stm_view.test
+share/mysql-test/suite/binlog/t/max_binlog_total_size-master.opt
+share/mysql-test/suite/binlog/t/max_binlog_total_size.test
 share/mysql-test/suite/binlog/t/mysqladmin.test
 share/mysql-test/suite/binlog/t/read_only.inc
 share/mysql-test/suite/binlog/t/read_only.test
@@ -5747,6 +6109,7 @@ share/mysql-test/suite/binlog_encryption/
 share/mysql-test/suite/binlog_encryption/binlog_incident.combinations
 share/mysql-test/suite/binlog_encryption/binlog_incident.result
 share/mysql-test/suite/binlog_encryption/binlog_incident.test
+share/mysql-test/suite/binlog_encryption/binlog_index-master.opt
 share/mysql-test/suite/binlog_encryption/binlog_index.result
 share/mysql-test/suite/binlog_encryption/binlog_index.test
 share/mysql-test/suite/binlog_encryption/binlog_ioerr.result
@@ -5947,6 +6310,8 @@ share/mysql-test/suite/compat/oracle/r/func_decode.result
 share/mysql-test/suite/compat/oracle/r/func_length.result
 share/mysql-test/suite/compat/oracle/r/func_misc.result
 share/mysql-test/suite/compat/oracle/r/func_pad.result
+share/mysql-test/suite/compat/oracle/r/func_qualified.result
+share/mysql-test/suite/compat/oracle/r/func_regexp_replace.result
 share/mysql-test/suite/compat/oracle/r/func_replace.result
 share/mysql-test/suite/compat/oracle/r/func_substr.result
 share/mysql-test/suite/compat/oracle/r/func_time.result
@@ -5959,6 +6324,7 @@ share/mysql-test/suite/compat/oracle/r/keywords.result
 share/mysql-test/suite/compat/oracle/r/minus.result
 share/mysql-test/suite/compat/oracle/r/misc.result
 share/mysql-test/suite/compat/oracle/r/mysqldump_restore.result
+share/mysql-test/suite/compat/oracle/r/mysqldump_restore_func_qualified.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
@@ -6006,6 +6372,7 @@ share/mysql-test/suite/compat/oracle/r/type_varchar2.result
 share/mysql-test/suite/compat/oracle/r/update_innodb.result
 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/vcol_innodb.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/
@@ -6027,6 +6394,8 @@ share/mysql-test/suite/compat/oracle/t/func_decode.test
 share/mysql-test/suite/compat/oracle/t/func_length.test
 share/mysql-test/suite/compat/oracle/t/func_misc.test
 share/mysql-test/suite/compat/oracle/t/func_pad.test
+share/mysql-test/suite/compat/oracle/t/func_qualified.test
+share/mysql-test/suite/compat/oracle/t/func_regexp_replace.test
 share/mysql-test/suite/compat/oracle/t/func_replace.test
 share/mysql-test/suite/compat/oracle/t/func_substr.test
 share/mysql-test/suite/compat/oracle/t/func_time.test
@@ -6039,6 +6408,7 @@ share/mysql-test/suite/compat/oracle/t/keywords.test
 share/mysql-test/suite/compat/oracle/t/minus.test
 share/mysql-test/suite/compat/oracle/t/misc.test
 share/mysql-test/suite/compat/oracle/t/mysqldump_restore.test
+share/mysql-test/suite/compat/oracle/t/mysqldump_restore_func_qualified.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
@@ -6090,6 +6460,7 @@ share/mysql-test/suite/compat/oracle/t/type_varchar2.test
 share/mysql-test/suite/compat/oracle/t/update_innodb.test
 share/mysql-test/suite/compat/oracle/t/variables.test
 share/mysql-test/suite/compat/oracle/t/vcol.test
+share/mysql-test/suite/compat/oracle/t/vcol_innodb.test
 share/mysql-test/suite/compat/oracle/t/versioning.test
 share/mysql-test/suite/compat/oracle/t/win.test
 share/mysql-test/suite/csv/
@@ -6101,6 +6472,8 @@ share/mysql-test/suite/csv/csv_not_null.result
 share/mysql-test/suite/csv/csv_not_null.test
 share/mysql-test/suite/csv/flush.result
 share/mysql-test/suite/csv/flush.test
+share/mysql-test/suite/csv/lowercase_table0.result
+share/mysql-test/suite/csv/lowercase_table0.test
 share/mysql-test/suite/csv/read_only.result
 share/mysql-test/suite/csv/read_only.test
 share/mysql-test/suite/encryption/
@@ -6141,7 +6514,6 @@ share/mysql-test/suite/encryption/r/innochecksum.result
 share/mysql-test/suite/encryption/r/innodb-bad-key-change.result
 share/mysql-test/suite/encryption/r/innodb-bad-key-change2.result
 share/mysql-test/suite/encryption/r/innodb-bad-key-change3.result
-share/mysql-test/suite/encryption/r/innodb-bad-key-change4.result
 share/mysql-test/suite/encryption/r/innodb-checksum-algorithm,32k.rdiff
 share/mysql-test/suite/encryption/r/innodb-checksum-algorithm,64k.rdiff
 share/mysql-test/suite/encryption/r/innodb-checksum-algorithm.result
@@ -6258,9 +6630,6 @@ share/mysql-test/suite/encryption/t/innodb-bad-key-change2.opt
 share/mysql-test/suite/encryption/t/innodb-bad-key-change2.test
 share/mysql-test/suite/encryption/t/innodb-bad-key-change3.combinations
 share/mysql-test/suite/encryption/t/innodb-bad-key-change3.test
-share/mysql-test/suite/encryption/t/innodb-bad-key-change4.combinations
-share/mysql-test/suite/encryption/t/innodb-bad-key-change4.opt
-share/mysql-test/suite/encryption/t/innodb-bad-key-change4.test
 share/mysql-test/suite/encryption/t/innodb-checksum-algorithm.test
 share/mysql-test/suite/encryption/t/innodb-compressed-blob.opt
 share/mysql-test/suite/encryption/t/innodb-compressed-blob.test
@@ -7259,6 +7628,42 @@ share/mysql-test/suite/engines/rr_trx/t/rr_sc_sum_total.test
 share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19.test
 share/mysql-test/suite/engines/rr_trx/t/rr_u_10-19_nolimit.test
 share/mysql-test/suite/engines/rr_trx/t/rr_u_4.test
+share/mysql-test/suite/events/
+share/mysql-test/suite/events/disabled.def
+share/mysql-test/suite/events/events_1.result
+share/mysql-test/suite/events/events_1.test
+share/mysql-test/suite/events/events_2.result
+share/mysql-test/suite/events/events_2.test
+share/mysql-test/suite/events/events_bugs-master.opt
+share/mysql-test/suite/events/events_bugs.result
+share/mysql-test/suite/events/events_bugs.test
+share/mysql-test/suite/events/events_embedded.result
+share/mysql-test/suite/events/events_embedded.test
+share/mysql-test/suite/events/events_grant.result
+share/mysql-test/suite/events/events_grant.test
+share/mysql-test/suite/events/events_logs_tests-master.opt
+share/mysql-test/suite/events/events_logs_tests.result
+share/mysql-test/suite/events/events_logs_tests.test
+share/mysql-test/suite/events/events_microsec.result
+share/mysql-test/suite/events/events_microsec.test
+share/mysql-test/suite/events/events_restart-master.opt
+share/mysql-test/suite/events/events_restart.result
+share/mysql-test/suite/events/events_restart.test
+share/mysql-test/suite/events/events_scheduling.result
+share/mysql-test/suite/events/events_scheduling.test
+share/mysql-test/suite/events/events_skip_grant_tables.opt
+share/mysql-test/suite/events/events_skip_grant_tables.result
+share/mysql-test/suite/events/events_skip_grant_tables.test
+share/mysql-test/suite/events/events_slowlog.result
+share/mysql-test/suite/events/events_slowlog.test
+share/mysql-test/suite/events/events_stress.result
+share/mysql-test/suite/events/events_stress.test
+share/mysql-test/suite/events/events_time_zone.result
+share/mysql-test/suite/events/events_time_zone.test
+share/mysql-test/suite/events/events_trans.result
+share/mysql-test/suite/events/events_trans.test
+share/mysql-test/suite/events/events_trans_notembedded.result
+share/mysql-test/suite/events/events_trans_notembedded.test
 share/mysql-test/suite/federated/
 share/mysql-test/suite/federated/assisted_discovery.result
 share/mysql-test/suite/federated/assisted_discovery.test
@@ -7323,6 +7728,8 @@ share/mysql-test/suite/federated/rpl.test
 share/mysql-test/suite/federated/suite.pm
 share/mysql-test/suite/federated/timestamps.result
 share/mysql-test/suite/federated/timestamps.test
+share/mysql-test/suite/federated/update.result
+share/mysql-test/suite/federated/update.test
 share/mysql-test/suite/funcs_1/
 share/mysql-test/suite/funcs_1/README.txt
 share/mysql-test/suite/funcs_1/bitdata/
@@ -7708,7 +8115,6 @@ share/mysql-test/suite/galera/include/have_stunnel.inc
 share/mysql-test/suite/galera/include/kill_galera.inc
 share/mysql-test/suite/galera/include/print_gtid.inc
 share/mysql-test/suite/galera/include/reset_query_cache.inc
-share/mysql-test/suite/galera/include/shutdown_mysqld.inc
 share/mysql-test/suite/galera/include/start_mysqld.inc
 share/mysql-test/suite/galera/my.cnf
 share/mysql-test/suite/galera/r/
@@ -7730,6 +8136,7 @@ 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-22227.result
+share/mysql-test/suite/galera/r/MDEV-22232.result
 share/mysql-test/suite/galera/r/MDEV-22421.result
 share/mysql-test/suite/galera/r/MDEV-22458.result
 share/mysql-test/suite/galera/r/MDEV-22708.result
@@ -7739,12 +8146,15 @@ share/mysql-test/suite/galera/r/MDEV-24327.result
 share/mysql-test/suite/galera/r/MDEV-25389.result
 share/mysql-test/suite/galera/r/MDEV-25494.result
 share/mysql-test/suite/galera/r/MDEV-25562.result
+share/mysql-test/suite/galera/r/MDEV-25731.result
 share/mysql-test/suite/galera/r/MDEV-25740.result
+share/mysql-test/suite/galera/r/MDEV-26499.result
 share/mysql-test/suite/galera/r/MDEV-26575.result
 share/mysql-test/suite/galera/r/MDEV-26597.result
 share/mysql-test/suite/galera/r/MDEV-27001.result
 share/mysql-test/suite/galera/r/MDEV-27123.result
 share/mysql-test/suite/galera/r/MDEV-27276.result
+share/mysql-test/suite/galera/r/MDEV-27806.result
 share/mysql-test/suite/galera/r/MDEV-27862.result
 share/mysql-test/suite/galera/r/MDEV-28053.result
 share/mysql-test/suite/galera/r/MDEV-29142.result
@@ -7752,6 +8162,16 @@ share/mysql-test/suite/galera/r/MDEV-29293.result
 share/mysql-test/suite/galera/r/MDEV-29512.result
 share/mysql-test/suite/galera/r/MDEV-30804.result
 share/mysql-test/suite/galera/r/MDEV-30955.result
+share/mysql-test/suite/galera/r/MDEV-31272.result
+share/mysql-test/suite/galera/r/MDEV-32549.result
+share/mysql-test/suite/galera/r/MDEV-32938.result
+share/mysql-test/suite/galera/r/MDEV-33064.result
+share/mysql-test/suite/galera/r/MDEV-33133.result
+share/mysql-test/suite/galera/r/MDEV-33136.result
+share/mysql-test/suite/galera/r/MDEV-33523.result
+share/mysql-test/suite/galera/r/MDEV-33828.result
+share/mysql-test/suite/galera/r/MDEV-34594.result
+share/mysql-test/suite/galera/r/MDEV-34647.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
@@ -7814,12 +8234,14 @@ 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_mariabackup.result
 share/mysql-test/suite/galera/r/galera_bf_abort_ps.result
 share/mysql-test/suite/galera/r/galera_bf_abort_ps_bind.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,debug.rdiff
 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
@@ -7829,6 +8251,7 @@ 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_stmt_autoinc.result
+share/mysql-test/suite/galera/r/galera_cache_index.result
 share/mysql-test/suite/galera/r/galera_can_run_toi.result
 share/mysql-test/suite/galera/r/galera_change_user.result
 share/mysql-test/suite/galera/r/galera_commit_empty.result
@@ -7851,6 +8274,7 @@ share/mysql-test/suite/galera/r/galera_drop_database.result
 share/mysql-test/suite/galera/r/galera_drop_multi.result
 share/mysql-test/suite/galera/r/galera_encrypt_tmp_files.result
 share/mysql-test/suite/galera/r/galera_enum.result
+share/mysql-test/suite/galera/r/galera_event_node_evict.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
@@ -7868,7 +8292,9 @@ share/mysql-test/suite/galera/r/galera_fk_setnull.result
 share/mysql-test/suite/galera/r/galera_fk_truncate.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_forced_binlog_format_ctas.result
 share/mysql-test/suite/galera/r/galera_ftwrl.result
+share/mysql-test/suite/galera/r/galera_ftwrl_concurrent.result
 share/mysql-test/suite/galera/r/galera_ftwrl_drain.result
 share/mysql-test/suite/galera/r/galera_fulltext.result
 share/mysql-test/suite/galera/r/galera_gcache_recover.result
@@ -7895,6 +8321,7 @@ share/mysql-test/suite/galera/r/galera_ist_mariabackup,debug.rdiff
 share/mysql-test/suite/galera/r/galera_ist_mariabackup.result
 share/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs,debug.rdiff
 share/mysql-test/suite/galera/r/galera_ist_mariabackup_innodb_flush_logs.result
+share/mysql-test/suite/galera/r/galera_ist_mariabackup_verify_ca.result
 share/mysql-test/suite/galera/r/galera_ist_mysqldump,debug.rdiff
 share/mysql-test/suite/galera/r/galera_ist_mysqldump,release.rdiff
 share/mysql-test/suite/galera/r/galera_ist_mysqldump.result
@@ -7903,7 +8330,9 @@ share/mysql-test/suite/galera/r/galera_ist_recv_bind.result
 share/mysql-test/suite/galera/r/galera_ist_restart_joiner.result
 share/mysql-test/suite/galera/r/galera_ist_rsync,debug.rdiff
 share/mysql-test/suite/galera/r/galera_ist_rsync.result
+share/mysql-test/suite/galera/r/galera_ist_rsync_verify_ca.result
 share/mysql-test/suite/galera/r/galera_kill_applier.result
+share/mysql-test/suite/galera/r/galera_kill_bf.result
 share/mysql-test/suite/galera/r/galera_kill_ddl.result
 share/mysql-test/suite/galera/r/galera_kill_group_commit.result
 share/mysql-test/suite/galera/r/galera_kill_nochanges.result
@@ -7940,6 +8369,7 @@ share/mysql-test/suite/galera/r/galera_parallel_autoinc_largetrx.result
 share/mysql-test/suite/galera/r/galera_parallel_autoinc_manytrx.result
 share/mysql-test/suite/galera/r/galera_parallel_simple.result
 share/mysql-test/suite/galera/r/galera_partition.result
+share/mysql-test/suite/galera/r/galera_partition_key.result
 share/mysql-test/suite/galera/r/galera_password.result
 share/mysql-test/suite/galera/r/galera_pc_ignore_sb.result
 share/mysql-test/suite/galera/r/galera_pc_recovery.result
@@ -7954,8 +8384,10 @@ share/mysql-test/suite/galera/r/galera_read_only.result
 share/mysql-test/suite/galera/r/galera_repair_view.result
 share/mysql-test/suite/galera/r/galera_repl_key_format_flat16.result
 share/mysql-test/suite/galera/r/galera_repl_max_ws_size.result
+share/mysql-test/suite/galera/r/galera_replica_no_gtid.result
 share/mysql-test/suite/galera/r/galera_restart_nochanges.result
 share/mysql-test/suite/galera/r/galera_restart_on_unknown_option.result
+share/mysql-test/suite/galera/r/galera_restart_replica.result
 share/mysql-test/suite/galera/r/galera_roles.result
 share/mysql-test/suite/galera/r/galera_rsu_add_pk.result
 share/mysql-test/suite/galera/r/galera_rsu_drop_pk.result
@@ -7967,6 +8399,7 @@ share/mysql-test/suite/galera/r/galera_sbr.result
 share/mysql-test/suite/galera/r/galera_sbr_binlog.result
 share/mysql-test/suite/galera/r/galera_schema.result
 share/mysql-test/suite/galera/r/galera_schema_dirty_reads.result
+share/mysql-test/suite/galera/r/galera_sequence_engine.result
 share/mysql-test/suite/galera/r/galera_sequences.result
 share/mysql-test/suite/galera/r/galera_serializable.result
 share/mysql-test/suite/galera/r/galera_server.result
@@ -8026,6 +8459,7 @@ share/mysql-test/suite/galera/r/galera_strict_require_primary_key.result
 share/mysql-test/suite/galera/r/galera_suspend_slave.result
 share/mysql-test/suite/galera/r/galera_sync_wait_show.result
 share/mysql-test/suite/galera/r/galera_sync_wait_upto.result
+share/mysql-test/suite/galera/r/galera_table_with_hyphen.result
 share/mysql-test/suite/galera/r/galera_temporary_sequences.result
 share/mysql-test/suite/galera/r/galera_toi_alter_auto_increment.result
 share/mysql-test/suite/galera/r/galera_toi_ddl_error.result
@@ -8065,7 +8499,6 @@ share/mysql-test/suite/galera/r/galera_var_log_bin.result
 share/mysql-test/suite/galera/r/galera_var_max_ws_rows.result
 share/mysql-test/suite/galera/r/galera_var_max_ws_size.result
 share/mysql-test/suite/galera/r/galera_var_mysql_replication_bundle.result
-share/mysql-test/suite/galera/r/galera_var_node_address.result
 share/mysql-test/suite/galera/r/galera_var_notify_cmd.result
 share/mysql-test/suite/galera/r/galera_var_notify_ssl_ipv6.result
 share/mysql-test/suite/galera/r/galera_var_reject_queries.result
@@ -8085,6 +8518,7 @@ share/mysql-test/suite/galera/r/galera_var_wsrep_start_position.result
 share/mysql-test/suite/galera/r/galera_view.result
 share/mysql-test/suite/galera/r/galera_virtual_blob.result
 share/mysql-test/suite/galera/r/galera_virtual_column.result
+share/mysql-test/suite/galera/r/galera_vote_ddl.result
 share/mysql-test/suite/galera/r/galera_vote_rejoin_ddl.result
 share/mysql-test/suite/galera/r/galera_vote_rejoin_dml.result
 share/mysql-test/suite/galera/r/galera_wan.result
@@ -8095,6 +8529,7 @@ share/mysql-test/suite/galera/r/galera_wsrep_log_conficts.result
 share/mysql-test/suite/galera/r/galera_wsrep_mode.result
 share/mysql-test/suite/galera/r/galera_wsrep_new_cluster.result
 share/mysql-test/suite/galera/r/galera_wsrep_provider_options_syntax.result
+share/mysql-test/suite/galera/r/galera_wsrep_schema_detached.result
 share/mysql-test/suite/galera/r/galera_zero_length_column.result
 share/mysql-test/suite/galera/r/grant.result
 share/mysql-test/suite/galera/r/have_wsrep_replicate_myisam.require
@@ -8107,10 +8542,14 @@ 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/mariadb_tzinfo_to_sql.result
+share/mysql-test/suite/galera/r/mdev-22063.result
 share/mysql-test/suite/galera/r/mdev-22543.result
 share/mysql-test/suite/galera/r/mdev-26175.result
 share/mysql-test/suite/galera/r/mdev-28433.result
 share/mysql-test/suite/galera/r/mdev-30013.result
+share/mysql-test/suite/galera/r/mdev-30653.result
+share/mysql-test/suite/galera/r/mdev-31285.result
+share/mysql-test/suite/galera/r/mdev-31651.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
@@ -8131,6 +8570,7 @@ share/mysql-test/suite/galera/r/mysql-wsrep-bugs-607.result
 share/mysql-test/suite/galera/r/mysql_tzinfo_to_sql.result
 share/mysql-test/suite/galera/r/partition.result
 share/mysql-test/suite/galera/r/rename.result
+share/mysql-test/suite/galera/r/rpl_galera_to_mariadb_clone_slave_using_mariadb-backup.result
 share/mysql-test/suite/galera/r/rpl_row_annotate.result
 share/mysql-test/suite/galera/r/sql_log_bin.result
 share/mysql-test/suite/galera/r/unique_key.result
@@ -8164,6 +8604,7 @@ 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-22227.test
+share/mysql-test/suite/galera/t/MDEV-22232.test
 share/mysql-test/suite/galera/t/MDEV-22421.test
 share/mysql-test/suite/galera/t/MDEV-22458.test
 share/mysql-test/suite/galera/t/MDEV-22708.cnf
@@ -8175,7 +8616,9 @@ share/mysql-test/suite/galera/t/MDEV-24327.test
 share/mysql-test/suite/galera/t/MDEV-25389.test
 share/mysql-test/suite/galera/t/MDEV-25494.test
 share/mysql-test/suite/galera/t/MDEV-25562.test
+share/mysql-test/suite/galera/t/MDEV-25731.test
 share/mysql-test/suite/galera/t/MDEV-25740.test
+share/mysql-test/suite/galera/t/MDEV-26499.test
 share/mysql-test/suite/galera/t/MDEV-26575.test
 share/mysql-test/suite/galera/t/MDEV-26597.test
 share/mysql-test/suite/galera/t/MDEV-27001.opt
@@ -8183,6 +8626,8 @@ share/mysql-test/suite/galera/t/MDEV-27001.test
 share/mysql-test/suite/galera/t/MDEV-27123.opt
 share/mysql-test/suite/galera/t/MDEV-27123.test
 share/mysql-test/suite/galera/t/MDEV-27276.test
+share/mysql-test/suite/galera/t/MDEV-27806.opt
+share/mysql-test/suite/galera/t/MDEV-27806.test
 share/mysql-test/suite/galera/t/MDEV-27862.combinations
 share/mysql-test/suite/galera/t/MDEV-27862.test
 share/mysql-test/suite/galera/t/MDEV-28053.cnf
@@ -8194,6 +8639,18 @@ share/mysql-test/suite/galera/t/MDEV-29512.test
 share/mysql-test/suite/galera/t/MDEV-30804.cnf
 share/mysql-test/suite/galera/t/MDEV-30804.test
 share/mysql-test/suite/galera/t/MDEV-30955.test
+share/mysql-test/suite/galera/t/MDEV-31272.combinations
+share/mysql-test/suite/galera/t/MDEV-31272.test
+share/mysql-test/suite/galera/t/MDEV-32549.test
+share/mysql-test/suite/galera/t/MDEV-32938.test
+share/mysql-test/suite/galera/t/MDEV-33064.test
+share/mysql-test/suite/galera/t/MDEV-33133.test
+share/mysql-test/suite/galera/t/MDEV-33136.test
+share/mysql-test/suite/galera/t/MDEV-33523.test
+share/mysql-test/suite/galera/t/MDEV-33828.cnf
+share/mysql-test/suite/galera/t/MDEV-33828.test
+share/mysql-test/suite/galera/t/MDEV-34594.test
+share/mysql-test/suite/galera/t/MDEV-34647.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
@@ -8285,6 +8742,8 @@ share/mysql-test/suite/galera/t/galera_bf_abort_for_update.test
 share/mysql-test/suite/galera/t/galera_bf_abort_ftwrl.test
 share/mysql-test/suite/galera/t/galera_bf_abort_get_lock.test
 share/mysql-test/suite/galera/t/galera_bf_abort_lock_table.test
+share/mysql-test/suite/galera/t/galera_bf_abort_mariabackup.cnf
+share/mysql-test/suite/galera/t/galera_bf_abort_mariabackup.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_bind.cnf
@@ -8311,6 +8770,7 @@ 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_stmt_autoinc.cnf
 share/mysql-test/suite/galera/t/galera_binlog_stmt_autoinc.test
+share/mysql-test/suite/galera/t/galera_cache_index.test
 share/mysql-test/suite/galera/t/galera_can_run_toi.test
 share/mysql-test/suite/galera/t/galera_change_user.test
 share/mysql-test/suite/galera/t/galera_commit_empty.test
@@ -8338,12 +8798,15 @@ share/mysql-test/suite/galera/t/galera_drop_multi.test
 share/mysql-test/suite/galera/t/galera_encrypt_tmp_files.cnf
 share/mysql-test/suite/galera/t/galera_encrypt_tmp_files.test
 share/mysql-test/suite/galera/t/galera_enum.test
+share/mysql-test/suite/galera/t/galera_event_node_evict.cnf
+share/mysql-test/suite/galera/t/galera_event_node_evict.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_lock_wait.cnf
 share/mysql-test/suite/galera/t/galera_fk_lock_wait.test
 share/mysql-test/suite/galera/t/galera_fk_mismatch.test
 share/mysql-test/suite/galera/t/galera_fk_multibyte.test
@@ -8354,9 +8817,12 @@ 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_fk_truncate.test
 share/mysql-test/suite/galera/t/galera_flush_local.test
+share/mysql-test/suite/galera/t/galera_forced_binlog_ctas_test.inc
 share/mysql-test/suite/galera/t/galera_forced_binlog_format-master.opt
 share/mysql-test/suite/galera/t/galera_forced_binlog_format.test
+share/mysql-test/suite/galera/t/galera_forced_binlog_format_ctas.test
 share/mysql-test/suite/galera/t/galera_ftwrl.test
+share/mysql-test/suite/galera/t/galera_ftwrl_concurrent.test
 share/mysql-test/suite/galera/t/galera_ftwrl_drain.test
 share/mysql-test/suite/galera/t/galera_fulltext.test
 share/mysql-test/suite/galera/t/galera_gcache_recover.cnf
@@ -8394,6 +8860,8 @@ share/mysql-test/suite/galera/t/galera_ist_mariabackup.cnf
 share/mysql-test/suite/galera/t/galera_ist_mariabackup.test
 share/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.cnf
 share/mysql-test/suite/galera/t/galera_ist_mariabackup_innodb_flush_logs.test
+share/mysql-test/suite/galera/t/galera_ist_mariabackup_verify_ca.cnf
+share/mysql-test/suite/galera/t/galera_ist_mariabackup_verify_ca.test
 share/mysql-test/suite/galera/t/galera_ist_mysqldump.cnf
 share/mysql-test/suite/galera/t/galera_ist_mysqldump.test
 share/mysql-test/suite/galera/t/galera_ist_progress.cnf
@@ -8404,8 +8872,11 @@ share/mysql-test/suite/galera/t/galera_ist_restart_joiner.cnf
 share/mysql-test/suite/galera/t/galera_ist_restart_joiner.test
 share/mysql-test/suite/galera/t/galera_ist_rsync.cnf
 share/mysql-test/suite/galera/t/galera_ist_rsync.test
+share/mysql-test/suite/galera/t/galera_ist_rsync_verify_ca.cnf
+share/mysql-test/suite/galera/t/galera_ist_rsync_verify_ca.test
 share/mysql-test/suite/galera/t/galera_kill_applier.cnf
 share/mysql-test/suite/galera/t/galera_kill_applier.test
+share/mysql-test/suite/galera/t/galera_kill_bf.test
 share/mysql-test/suite/galera/t/galera_kill_ddl.test
 share/mysql-test/suite/galera/t/galera_kill_group_commit.cnf
 share/mysql-test/suite/galera/t/galera_kill_group_commit.test
@@ -8457,8 +8928,8 @@ share/mysql-test/suite/galera/t/galera_parallel_apply_lock_table.test
 share/mysql-test/suite/galera/t/galera_parallel_autoinc_largetrx.test
 share/mysql-test/suite/galera/t/galera_parallel_autoinc_manytrx.test
 share/mysql-test/suite/galera/t/galera_parallel_simple.test
-share/mysql-test/suite/galera/t/galera_partition.cnf
 share/mysql-test/suite/galera/t/galera_partition.test
+share/mysql-test/suite/galera/t/galera_partition_key.test
 share/mysql-test/suite/galera/t/galera_password.test
 share/mysql-test/suite/galera/t/galera_pc_ignore_sb.cnf
 share/mysql-test/suite/galera/t/galera_pc_ignore_sb.test
@@ -8477,8 +8948,12 @@ share/mysql-test/suite/galera/t/galera_read_only.test
 share/mysql-test/suite/galera/t/galera_repair_view.test
 share/mysql-test/suite/galera/t/galera_repl_key_format_flat16.test
 share/mysql-test/suite/galera/t/galera_repl_max_ws_size.test
+share/mysql-test/suite/galera/t/galera_replica_no_gtid.cnf
+share/mysql-test/suite/galera/t/galera_replica_no_gtid.test
 share/mysql-test/suite/galera/t/galera_restart_nochanges.test
 share/mysql-test/suite/galera/t/galera_restart_on_unknown_option.test
+share/mysql-test/suite/galera/t/galera_restart_replica.cnf
+share/mysql-test/suite/galera/t/galera_restart_replica.test
 share/mysql-test/suite/galera/t/galera_roles.test
 share/mysql-test/suite/galera/t/galera_rsu_add_pk.test
 share/mysql-test/suite/galera/t/galera_rsu_drop_pk.test
@@ -8491,6 +8966,7 @@ share/mysql-test/suite/galera/t/galera_sbr_binlog.cnf
 share/mysql-test/suite/galera/t/galera_sbr_binlog.test
 share/mysql-test/suite/galera/t/galera_schema.test
 share/mysql-test/suite/galera/t/galera_schema_dirty_reads.test
+share/mysql-test/suite/galera/t/galera_sequence_engine.test
 share/mysql-test/suite/galera/t/galera_sequences.cnf
 share/mysql-test/suite/galera/t/galera_sequences.test
 share/mysql-test/suite/galera/t/galera_serializable.test
@@ -8568,6 +9044,8 @@ share/mysql-test/suite/galera/t/galera_sync_wait_upto-master.opt
 share/mysql-test/suite/galera/t/galera_sync_wait_upto.cnf
 share/mysql-test/suite/galera/t/galera_sync_wait_upto.combinations
 share/mysql-test/suite/galera/t/galera_sync_wait_upto.test
+share/mysql-test/suite/galera/t/galera_table_with_hyphen.inc
+share/mysql-test/suite/galera/t/galera_table_with_hyphen.test
 share/mysql-test/suite/galera/t/galera_temporary_sequences.test
 share/mysql-test/suite/galera/t/galera_toi_alter_auto_increment.test
 share/mysql-test/suite/galera/t/galera_toi_ddl_error.test
@@ -8615,8 +9093,6 @@ share/mysql-test/suite/galera/t/galera_var_log_bin.test
 share/mysql-test/suite/galera/t/galera_var_max_ws_rows.test
 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-master.opt
 share/mysql-test/suite/galera/t/galera_var_notify_cmd.test
 share/mysql-test/suite/galera/t/galera_var_notify_ssl_ipv6-master.opt
@@ -8641,6 +9117,8 @@ share/mysql-test/suite/galera/t/galera_var_wsrep_start_position.test
 share/mysql-test/suite/galera/t/galera_view.test
 share/mysql-test/suite/galera/t/galera_virtual_blob.test
 share/mysql-test/suite/galera/t/galera_virtual_column.test
+share/mysql-test/suite/galera/t/galera_vote_ddl.inc
+share/mysql-test/suite/galera/t/galera_vote_ddl.test
 share/mysql-test/suite/galera/t/galera_vote_drop_temporary-master.opt
 share/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.cnf
 share/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test
@@ -8658,6 +9136,7 @@ share/mysql-test/suite/galera/t/galera_wsrep_log_conficts.test
 share/mysql-test/suite/galera/t/galera_wsrep_mode.test
 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_schema_detached.test
 share/mysql-test/suite/galera/t/galera_zero_length_column.test
 share/mysql-test/suite/galera/t/grant.test
 share/mysql-test/suite/galera/t/lp1276424.test
@@ -8670,10 +9149,14 @@ share/mysql-test/suite/galera/t/lp1438990.test
 share/mysql-test/suite/galera/t/lp959512.test
 share/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.opt
 share/mysql-test/suite/galera/t/mariadb_tzinfo_to_sql.test
+share/mysql-test/suite/galera/t/mdev-22063.test
 share/mysql-test/suite/galera/t/mdev-22543.test
 share/mysql-test/suite/galera/t/mdev-26175.test
 share/mysql-test/suite/galera/t/mdev-28433.test
 share/mysql-test/suite/galera/t/mdev-30013.test
+share/mysql-test/suite/galera/t/mdev-30653.test
+share/mysql-test/suite/galera/t/mdev-31285.test
+share/mysql-test/suite/galera/t/mdev-31651.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
@@ -8698,6 +9181,8 @@ share/mysql-test/suite/galera/t/mysql_tzinfo_to_sql.opt
 share/mysql-test/suite/galera/t/mysql_tzinfo_to_sql.test
 share/mysql-test/suite/galera/t/partition.test
 share/mysql-test/suite/galera/t/rename.test
+share/mysql-test/suite/galera/t/rpl_galera_to_mariadb_clone_slave_using_mariadb-backup.cnf
+share/mysql-test/suite/galera/t/rpl_galera_to_mariadb_clone_slave_using_mariadb-backup.test
 share/mysql-test/suite/galera/t/rpl_row_annotate.cnf
 share/mysql-test/suite/galera/t/rpl_row_annotate.test
 share/mysql-test/suite/galera/t/sql_log_bin.test
@@ -8724,13 +9209,16 @@ share/mysql-test/suite/galera_3nodes/r/GCF-376.result
 share/mysql-test/suite/galera_3nodes/r/MDEV-29171.result
 share/mysql-test/suite/galera_3nodes/r/galera-features#119.result
 share/mysql-test/suite/galera_3nodes/r/galera_2_cluster.result
+share/mysql-test/suite/galera_3nodes/r/galera_allowlist.result
 share/mysql-test/suite/galera_3nodes/r/galera_certification_ccc.result
 share/mysql-test/suite/galera_3nodes/r/galera_certification_double_failure.result
+share/mysql-test/suite/galera_3nodes/r/galera_duplicate_primary_value.result
 share/mysql-test/suite/galera_3nodes/r/galera_dynamic_protocol.result
 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_garbd_backup.result
 share/mysql-test/suite/galera_3nodes/r/galera_gtid_2_cluster.result
+share/mysql-test/suite/galera_3nodes/r/galera_gtid_consistency.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
@@ -8747,6 +9235,7 @@ share/mysql-test/suite/galera_3nodes/r/galera_safe_to_bootstrap.result
 share/mysql-test/suite/galera_3nodes/r/galera_ssl_reload.result
 share/mysql-test/suite/galera_3nodes/r/galera_toi_vote.result
 share/mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result
+share/mysql-test/suite/galera_3nodes/r/galera_var_node_address.result
 share/mysql-test/suite/galera_3nodes/r/galera_vote_rejoin_mysqldump.result
 share/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema.result
 share/mysql-test/suite/galera_3nodes/r/galera_wsrep_schema_init.result
@@ -8766,8 +9255,12 @@ share/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
 share/mysql-test/suite/galera_3nodes/t/galera-features#119.test
 share/mysql-test/suite/galera_3nodes/t/galera_2_cluster.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_2_cluster.test
+share/mysql-test/suite/galera_3nodes/t/galera_allowlist.cnf
+share/mysql-test/suite/galera_3nodes/t/galera_allowlist.test
 share/mysql-test/suite/galera_3nodes/t/galera_certification_ccc.test
 share/mysql-test/suite/galera_3nodes/t/galera_certification_double_failure.test
+share/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.cnf
+share/mysql-test/suite/galera_3nodes/t/galera_duplicate_primary_value.test
 share/mysql-test/suite/galera_3nodes/t/galera_dynamic_protocol.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_dynamic_protocol.test
 share/mysql-test/suite/galera_3nodes/t/galera_evs_suspect_timeout.test
@@ -8776,6 +9269,8 @@ share/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_garbd_backup.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_gtid_consistency.cnf
+share/mysql-test/suite/galera_3nodes/t/galera_gtid_consistency.test
 share/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup.test
 share/mysql-test/suite/galera_3nodes/t/galera_ipv6_mariabackup_section.cnf
@@ -8803,6 +9298,8 @@ share/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test
 share/mysql-test/suite/galera_3nodes/t/galera_toi_vote.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_toi_vote.test
 share/mysql-test/suite/galera_3nodes/t/galera_var_dirty_reads2.test
+share/mysql-test/suite/galera_3nodes/t/galera_var_node_address.cnf
+share/mysql-test/suite/galera_3nodes/t/galera_var_node_address.test
 share/mysql-test/suite/galera_3nodes/t/galera_vote_rejoin_mysqldump.cnf
 share/mysql-test/suite/galera_3nodes/t/galera_vote_rejoin_mysqldump.test
 share/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test
@@ -8887,10 +9384,14 @@ share/mysql-test/suite/galera_sr/r/MDEV-25717.result
 share/mysql-test/suite/galera_sr/r/MDEV-25718.result
 share/mysql-test/suite/galera_sr/r/MDEV-27553.result
 share/mysql-test/suite/galera_sr/r/MDEV-27615.result
+share/mysql-test/suite/galera_sr/r/MDEV-28971.result
 share/mysql-test/suite/galera_sr/r/MDEV-30838.result
 share/mysql-test/suite/galera_sr/r/MDEV-30862.result
+share/mysql-test/suite/galera_sr/r/MDEV-32051.result
+share/mysql-test/suite/galera_sr/r/MDEV-34836.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_bf_abort_idle.result
 share/mysql-test/suite/galera_sr/r/galera_sr_blob.result
 share/mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
 share/mysql-test/suite/galera_sr/r/galera_sr_cc_no_primary.result
@@ -8990,11 +9491,15 @@ share/mysql-test/suite/galera_sr/t/MDEV-25718.cnf
 share/mysql-test/suite/galera_sr/t/MDEV-25718.test
 share/mysql-test/suite/galera_sr/t/MDEV-27553.test
 share/mysql-test/suite/galera_sr/t/MDEV-27615.test
+share/mysql-test/suite/galera_sr/t/MDEV-28971.test
 share/mysql-test/suite/galera_sr/t/MDEV-30838.test
 share/mysql-test/suite/galera_sr/t/MDEV-30862.test
+share/mysql-test/suite/galera_sr/t/MDEV-32051.test
+share/mysql-test/suite/galera_sr/t/MDEV-34836.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
+share/mysql-test/suite/galera_sr/t/galera_sr_bf_abort_idle.test
 share/mysql-test/suite/galera_sr/t/galera_sr_blob.test
 share/mysql-test/suite/galera_sr/t/galera_sr_cc_master.test
 share/mysql-test/suite/galera_sr/t/galera_sr_cc_no_primary.test
@@ -9074,6 +9579,7 @@ share/mysql-test/suite/galera_sr/t/mysql-wsrep-features#9.test
 share/mysql-test/suite/galera_sr/t/mysql-wsrep-features#93.test
 share/mysql-test/suite/galera_sr/t/mysql-wsrep-features#96.test
 share/mysql-test/suite/gcol/
+share/mysql-test/suite/gcol/disabled.def
 share/mysql-test/suite/gcol/inc/
 share/mysql-test/suite/gcol/inc/gcol_blocked_sql_funcs_main.inc
 share/mysql-test/suite/gcol/inc/gcol_cleanup.inc
@@ -9241,9 +9747,10 @@ share/mysql-test/suite/innodb/include/have_innodb_lzo.opt
 share/mysql-test/suite/innodb/include/have_innodb_punchhole.inc
 share/mysql-test/suite/innodb/include/have_innodb_snappy.opt
 share/mysql-test/suite/innodb/include/have_undo_tablespaces.combinations
-share/mysql-test/suite/innodb/include/have_undo_tablespaces.inc
 share/mysql-test/suite/innodb/include/ibd_convert.pl
 share/mysql-test/suite/innodb/include/import.inc
+share/mysql-test/suite/innodb/include/import_begin.inc
+share/mysql-test/suite/innodb/include/import_end.inc
 share/mysql-test/suite/innodb/include/innodb-util.pl
 share/mysql-test/suite/innodb/include/innodb-wl6045.inc
 share/mysql-test/suite/innodb/include/innodb_binlog.combinations
@@ -9255,6 +9762,8 @@ share/mysql-test/suite/innodb/include/innodb_isolation_selects.inc
 share/mysql-test/suite/innodb/include/innodb_merge_threshold_delete.inc
 share/mysql-test/suite/innodb/include/innodb_merge_threshold_secondary.inc
 share/mysql-test/suite/innodb/include/innodb_merge_threshold_update.inc
+share/mysql-test/suite/innodb/include/innodb_row_format_2.combinations
+share/mysql-test/suite/innodb/include/innodb_row_format_2.inc
 share/mysql-test/suite/innodb/include/innodb_stats.inc
 share/mysql-test/suite/innodb/include/log_file_cleanup.inc
 share/mysql-test/suite/innodb/include/no_checkpoint_end.inc
@@ -9266,6 +9775,7 @@ share/mysql-test/suite/innodb/include/wait_all_purged.inc
 share/mysql-test/suite/innodb/r/
 share/mysql-test/suite/innodb/r/101_compatibility.result
 share/mysql-test/suite/innodb/r/add_constraint.result
+share/mysql-test/suite/innodb/r/add_foreign_key.result
 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
@@ -9273,6 +9783,8 @@ 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_copy_bulk,OFF.rdiff
+share/mysql-test/suite/innodb/r/alter_copy_bulk.result
 share/mysql-test/suite/innodb/r/alter_crash.result
 share/mysql-test/suite/innodb/r/alter_crash_rebuild.result
 share/mysql-test/suite/innodb/r/alter_dml_apply.result
@@ -9301,6 +9813,7 @@ share/mysql-test/suite/innodb/r/alter_varchar_change.result
 share/mysql-test/suite/innodb/r/analyze_table.result
 share/mysql-test/suite/innodb/r/auto_increment_dup.result
 share/mysql-test/suite/innodb/r/autoinc_debug.result
+share/mysql-test/suite/innodb/r/autoinc_import.result
 share/mysql-test/suite/innodb/r/autoinc_persist,desc.rdiff
 share/mysql-test/suite/innodb/r/autoinc_persist.result
 share/mysql-test/suite/innodb/r/binlog_consistent.result
@@ -9309,6 +9822,7 @@ share/mysql-test/suite/innodb/r/blob-update-debug.result
 share/mysql-test/suite/innodb/r/blob_cmp_empty.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/cascade_lock_wait.result
 share/mysql-test/suite/innodb/r/change_column_collation.result
 share/mysql-test/suite/innodb/r/check_ibd_filesize,32k.rdiff
 share/mysql-test/suite/innodb/r/check_ibd_filesize,4k.rdiff
@@ -9329,9 +9843,11 @@ share/mysql-test/suite/innodb/r/corrupted_during_recovery.result
 share/mysql-test/suite/innodb/r/count_distinct.result
 share/mysql-test/suite/innodb/r/create-index.result
 share/mysql-test/suite/innodb/r/create_isl_with_direct.result
+share/mysql-test/suite/innodb/r/create_like.result
 share/mysql-test/suite/innodb/r/create_select.result
 share/mysql-test/suite/innodb/r/create_table_insert_skip_locked.result
 share/mysql-test/suite/innodb/r/cursor-restore-locking.result
+share/mysql-test/suite/innodb/r/cursor-restore-unique-null.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,ON.rdiff
@@ -9348,20 +9864,23 @@ share/mysql-test/suite/innodb/r/default_row_format_compatibility.result
 share/mysql-test/suite/innodb/r/default_row_format_create,dynamic.rdiff
 share/mysql-test/suite/innodb/r/default_row_format_create,redundant.rdiff
 share/mysql-test/suite/innodb/r/default_row_format_create.result
-share/mysql-test/suite/innodb/r/defrag_mdl-9155.result
 share/mysql-test/suite/innodb/r/dml_purge.result
 share/mysql-test/suite/innodb/r/doublewrite.result
+share/mysql-test/suite/innodb/r/doublewrite_debug.result
 share/mysql-test/suite/innodb/r/dropdb.result
 share/mysql-test/suite/innodb/r/dropdb_cs.result
 share/mysql-test/suite/innodb/r/encryption_threads_shutdown.result
 share/mysql-test/suite/innodb/r/evict_tables_on_commit_debug.result
 share/mysql-test/suite/innodb/r/file_format_defaults.result
 share/mysql-test/suite/innodb/r/fk_col_alter.result
+share/mysql-test/suite/innodb/r/fk_drop_alter.result
 share/mysql-test/suite/innodb/r/flush.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/foreign_key_not_windows.result
+share/mysql-test/suite/innodb/r/foreign_null,COPY.rdiff
+share/mysql-test/suite/innodb/r/foreign_null.result
 share/mysql-test/suite/innodb/r/full_crc32_import.result
 share/mysql-test/suite/innodb/r/gap_lock_split.result
 share/mysql-test/suite/innodb/r/gap_locks.result
@@ -9373,12 +9892,18 @@ share/mysql-test/suite/innodb/r/group_commit_crash_no_optimize_thread.result
 share/mysql-test/suite/innodb/r/group_commit_force_recovery.result
 share/mysql-test/suite/innodb/r/group_commit_no_optimize_thread.result
 share/mysql-test/suite/innodb/r/help_url.result
-share/mysql-test/suite/innodb/r/ibuf_delete.result
-share/mysql-test/suite/innodb/r/ibuf_not_empty.result
 share/mysql-test/suite/innodb/r/implicit_gap_lock_convertion.result
+share/mysql-test/suite/innodb/r/import.result
 share/mysql-test/suite/innodb/r/import_bugs.result
 share/mysql-test/suite/innodb/r/import_corrupted.result
+share/mysql-test/suite/innodb/r/import_hidden_fts.result
+share/mysql-test/suite/innodb/r/import_hidden_fts_debug.result
+share/mysql-test/suite/innodb/r/import_no_cfg.result
+share/mysql-test/suite/innodb/r/import_recovery.result
+share/mysql-test/suite/innodb/r/import_run_once.result
 share/mysql-test/suite/innodb/r/import_tablespace_race.result
+share/mysql-test/suite/innodb/r/import_update_stats.result
+share/mysql-test/suite/innodb/r/index_length.result
 share/mysql-test/suite/innodb/r/index_merge_threshold.result
 share/mysql-test/suite/innodb/r/index_tree_operation.result
 share/mysql-test/suite/innodb/r/index_vcol_purge_startup.result
@@ -9388,6 +9913,7 @@ share/mysql-test/suite/innodb/r/innodb-32k-crash.result
 share/mysql-test/suite/innodb/r/innodb-32k.result
 share/mysql-test/suite/innodb/r/innodb-64k-crash.result
 share/mysql-test/suite/innodb/r/innodb-64k.result
+share/mysql-test/suite/innodb/r/innodb-ac-non-locking-select.result
 share/mysql-test/suite/innodb/r/innodb-agregate.result
 share/mysql-test/suite/innodb/r/innodb-alter-autoinc.result
 share/mysql-test/suite/innodb/r/innodb-alter-debug.result
@@ -9427,13 +9953,14 @@ share/mysql-test/suite/innodb/r/innodb-index-online.result
 share/mysql-test/suite/innodb/r/innodb-index.result
 share/mysql-test/suite/innodb/r/innodb-index_ucs2.result
 share/mysql-test/suite/innodb/r/innodb-isolation.result
+share/mysql-test/suite/innodb/r/innodb-lock-inherit-read_commited.result
 share/mysql-test/suite/innodb/r/innodb-lock.result
-share/mysql-test/suite/innodb/r/innodb-lru-force-no-free-page.result
 share/mysql-test/suite/innodb/r/innodb-mdev-7408.result
 share/mysql-test/suite/innodb/r/innodb-mdev-7513.result
 share/mysql-test/suite/innodb/r/innodb-mdev7046.result
 share/mysql-test/suite/innodb/r/innodb-on-duplicate-update.result
 share/mysql-test/suite/innodb/r/innodb-online-alter-gis.result
+share/mysql-test/suite/innodb/r/innodb-page_compression_none.result
 share/mysql-test/suite/innodb/r/innodb-read-view.result
 share/mysql-test/suite/innodb/r/innodb-replace-debug.result
 share/mysql-test/suite/innodb/r/innodb-replace.result
@@ -9453,7 +9980,6 @@ share/mysql-test/suite/innodb/r/innodb-update-insert.result
 share/mysql-test/suite/innodb/r/innodb-virtual-columns-debug.result
 share/mysql-test/suite/innodb/r/innodb-virtual-columns.result
 share/mysql-test/suite/innodb/r/innodb-virtual-columns2.result
-share/mysql-test/suite/innodb/r/innodb-wl5522,crc32.rdiff
 share/mysql-test/suite/innodb/r/innodb-wl5522,strict_crc32.rdiff
 share/mysql-test/suite/innodb/r/innodb-wl5522-1.result
 share/mysql-test/suite/innodb/r/innodb-wl5522-debug.result
@@ -9473,7 +9999,6 @@ 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
 share/mysql-test/suite/innodb/r/innodb_bug12661768.result
-share/mysql-test/suite/innodb/r/innodb_bug12902967.result
 share/mysql-test/suite/innodb/r/innodb_bug13510739.result
 share/mysql-test/suite/innodb/r/innodb_bug14007649.result
 share/mysql-test/suite/innodb/r/innodb_bug14147491.result
@@ -9521,7 +10046,6 @@ share/mysql-test/suite/innodb/r/innodb_bug57904.result
 share/mysql-test/suite/innodb/r/innodb_bug59307.result
 share/mysql-test/suite/innodb/r/innodb_bug59410.result
 share/mysql-test/suite/innodb/r/innodb_bug59641.result
-share/mysql-test/suite/innodb/r/innodb_bug59733.result
 share/mysql-test/suite/innodb/r/innodb_bug60049.result
 share/mysql-test/suite/innodb/r/innodb_bug60196.result
 share/mysql-test/suite/innodb/r/innodb_bug60229.result
@@ -9537,16 +10061,12 @@ share/mysql-test/suite/innodb/r/innodb_ctype_latin1.result
 share/mysql-test/suite/innodb/r/innodb_ctype_ldml.result
 share/mysql-test/suite/innodb/r/innodb_ctype_tis620.result
 share/mysql-test/suite/innodb/r/innodb_ctype_utf8.result
-share/mysql-test/suite/innodb/r/innodb_defrag_binlog.result
-share/mysql-test/suite/innodb/r/innodb_defrag_concurrent.result
-share/mysql-test/suite/innodb/r/innodb_defrag_stats.result
-share/mysql-test/suite/innodb/r/innodb_defrag_stats_many_tables.result
-share/mysql-test/suite/innodb/r/innodb_defragment.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_i_s_innodb_locks.result
+share/mysql-test/suite/innodb/r/innodb_i_s_innodb_trx.result
 share/mysql-test/suite/innodb/r/innodb_information_schema.result
 share/mysql-test/suite/innodb/r/innodb_information_schema_buffer.result
 share/mysql-test/suite/innodb/r/innodb_information_schema_tables.result
@@ -9563,16 +10083,26 @@ share/mysql-test/suite/innodb/r/innodb_row_lock_time_ms.result
 share/mysql-test/suite/innodb/r/innodb_scrub.result
 share/mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
 share/mysql-test/suite/innodb/r/innodb_stats.result
+share/mysql-test/suite/innodb/r/innodb_stats_auto_recalc.result
+share/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_ddl.result
+share/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_lots.result
+share/mysql-test/suite/innodb/r/innodb_stats_auto_recalc_on_nonexistent.result
 share/mysql-test/suite/innodb/r/innodb_stats_create_on_corrupted.result
 share/mysql-test/suite/innodb/r/innodb_stats_create_table.result
 share/mysql-test/suite/innodb/r/innodb_stats_drop_locked.result
+share/mysql-test/suite/innodb/r/innodb_stats_external_pages.result
 share/mysql-test/suite/innodb/r/innodb_stats_fetch.result
 share/mysql-test/suite/innodb/r/innodb_stats_fetch_corrupted.result
 share/mysql-test/suite/innodb/r/innodb_stats_fetch_nonexistent.result
+share/mysql-test/suite/innodb/r/innodb_stats_flag_global,off.rdiff
+share/mysql-test/suite/innodb/r/innodb_stats_flag_global.result
 share/mysql-test/suite/innodb/r/innodb_stats_persistent.result
 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_stats_sample_pages.result
+share/mysql-test/suite/innodb/r/innodb_stats_table_flag_auto_recalc.result
+share/mysql-test/suite/innodb/r/innodb_stats_table_flag_sample_pages.result
 share/mysql-test/suite/innodb/r/innodb_status_variables.result
 share/mysql-test/suite/innodb/r/innodb_sys_var_valgrind.result
 share/mysql-test/suite/innodb/r/innodb_timeout_rollback.result
@@ -9581,6 +10111,7 @@ share/mysql-test/suite/innodb/r/innodb_uninstall.result
 share/mysql-test/suite/innodb/r/insert-before-delete.result
 share/mysql-test/suite/innodb/r/insert_debug.result
 share/mysql-test/suite/innodb/r/insert_into_empty,32k.rdiff
+share/mysql-test/suite/innodb/r/insert_into_empty,4k.rdiff
 share/mysql-test/suite/innodb/r/insert_into_empty,64k.rdiff
 share/mysql-test/suite/innodb/r/insert_into_empty.result
 share/mysql-test/suite/innodb/r/insert_into_empty_debug.result
@@ -9618,62 +10149,76 @@ share/mysql-test/suite/innodb/r/leaf_page_corrupted_during_recovery.result
 share/mysql-test/suite/innodb/r/lock_delete_updated.result
 share/mysql-test/suite/innodb/r/lock_deleted.result
 share/mysql-test/suite/innodb/r/lock_insert_into_empty.result
+share/mysql-test/suite/innodb/r/lock_isolation.result
+share/mysql-test/suite/innodb/r/lock_memory.result
+share/mysql-test/suite/innodb/r/lock_memory_debug.result
 share/mysql-test/suite/innodb/r/lock_move_wait_lock_race.result
+share/mysql-test/suite/innodb/r/lock_release.result
 share/mysql-test/suite/innodb/r/lock_update_split_rc.result
 share/mysql-test/suite/innodb/r/log_corruption.result
 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_overwrite.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/log_upgrade.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
-share/mysql-test/suite/innodb/r/max_record_size,32k,compact,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,32k,dynamic,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,32k,innodb,redundant.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,4k,compact,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,4k,dynamic,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,4k,innodb,redundant.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,64k,compact,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,64k,dynamic,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,64k,innodb,redundant.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,8k,compact,innodb.rdiff
-share/mysql-test/suite/innodb/r/max_record_size,8k,dynamic,innodb.rdiff
+share/mysql-test/suite/innodb/r/log_upgrade_101_flags.result
+share/mysql-test/suite/innodb/r/max_record_size,16k,compact.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,16k,dynamic.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,16k,redundant.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,32k,compact.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,32k,dynamic.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,32k,redundant.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,4k,compact.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,4k,dynamic.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,4k,redundant.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,64k,compact.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,64k,dynamic.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,64k,redundant.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,8k,compact.rdiff
+share/mysql-test/suite/innodb/r/max_record_size,8k,dynamic.rdiff
 share/mysql-test/suite/innodb/r/max_record_size.result
 share/mysql-test/suite/innodb/r/mdev-117.result
 share/mysql-test/suite/innodb/r/mdev-14846.result
-share/mysql-test/suite/innodb/r/mdev-15707.result
+share/mysql-test/suite/innodb/r/mem_pressure.result
 share/mysql-test/suite/innodb/r/missing_tablespaces.result
+share/mysql-test/suite/innodb/r/mon_lock_wait_current_count.result
 share/mysql-test/suite/innodb/r/monitor.result
 share/mysql-test/suite/innodb/r/multi_repair-7404.result
 share/mysql-test/suite/innodb/r/mvcc.result
 share/mysql-test/suite/innodb/r/mvcc_secondary.result
 share/mysql-test/suite/innodb/r/no_pad.result
 share/mysql-test/suite/innodb/r/online_table_rebuild.result
+share/mysql-test/suite/innodb/r/open_files_limit.result
 share/mysql-test/suite/innodb/r/page_cleaner.result
+share/mysql-test/suite/innodb/r/page_compression_windows.result
 share/mysql-test/suite/innodb/r/page_id_innochecksum.result
 share/mysql-test/suite/innodb/r/page_reorganize.result
 share/mysql-test/suite/innodb/r/partition_locking.result
 share/mysql-test/suite/innodb/r/purge.result
 share/mysql-test/suite/innodb/r/purge_secondary.result
-share/mysql-test/suite/innodb/r/purge_thread_shutdown.result
 share/mysql-test/suite/innodb/r/read_only_recover_committed.result
 share/mysql-test/suite/innodb/r/read_only_recovery.result
 share/mysql-test/suite/innodb/r/readahead.result
+share/mysql-test/suite/innodb/r/records_in_range,4k.rdiff
+share/mysql-test/suite/innodb/r/records_in_range,8k.rdiff
+share/mysql-test/suite/innodb/r/records_in_range.result
 share/mysql-test/suite/innodb/r/recovery_memory.result
 share/mysql-test/suite/innodb/r/recovery_shutdown.result
 share/mysql-test/suite/innodb/r/rename_table.result
-share/mysql-test/suite/innodb/r/restart,16k,innodb.rdiff
-share/mysql-test/suite/innodb/r/restart,32k,innodb.rdiff
-share/mysql-test/suite/innodb/r/restart,4k,innodb.rdiff
-share/mysql-test/suite/innodb/r/restart,64k,innodb.rdiff
-share/mysql-test/suite/innodb/r/restart,8k,innodb.rdiff
+share/mysql-test/suite/innodb/r/restart,16k.rdiff
+share/mysql-test/suite/innodb/r/restart,32k.rdiff
+share/mysql-test/suite/innodb/r/restart,4k.rdiff
+share/mysql-test/suite/innodb/r/restart,64k.rdiff
+share/mysql-test/suite/innodb/r/restart,8k.rdiff
 share/mysql-test/suite/innodb/r/restart.result
 share/mysql-test/suite/innodb/r/row_format_redundant.result
 share/mysql-test/suite/innodb/r/row_lock.result
+share/mysql-test/suite/innodb/r/row_size_error_log_warnings_3,4k.rdiff
 share/mysql-test/suite/innodb/r/row_size_error_log_warnings_3.result
+share/mysql-test/suite/innodb/r/scrub.result
+share/mysql-test/suite/innodb/r/scrub_debug.result
 share/mysql-test/suite/innodb/r/skip_locked_nowait.result
 share/mysql-test/suite/innodb/r/skip_symbolic_links.result
 share/mysql-test/suite/innodb/r/snapshot.result
@@ -9683,14 +10228,24 @@ 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/sys_truncate.result
+share/mysql-test/suite/innodb/r/sys_truncate_debug.result
+share/mysql-test/suite/innodb/r/sys_truncate_large.result
+share/mysql-test/suite/innodb/r/sys_truncate_shutdown.result
+share/mysql-test/suite/innodb/r/sys_truncate_shutdown_debug.result
 share/mysql-test/suite/innodb/r/system_tables.result
 share/mysql-test/suite/innodb/r/table_definition_cache_debug.result
 share/mysql-test/suite/innodb/r/table_flags,32k.rdiff
 share/mysql-test/suite/innodb/r/table_flags,64k.rdiff
 share/mysql-test/suite/innodb/r/table_flags.result
 share/mysql-test/suite/innodb/r/table_index_statistics.result
+share/mysql-test/suite/innodb/r/tablespace_per_table_not_windows.result
+share/mysql-test/suite/innodb/r/tablespace_per_table_windows.result
 share/mysql-test/suite/innodb/r/temp_table.result
 share/mysql-test/suite/innodb/r/temp_table_savepoint.result
+share/mysql-test/suite/innodb/r/temp_truncate.result
+share/mysql-test/suite/innodb/r/temp_truncate_debug.result
+share/mysql-test/suite/innodb/r/temp_truncate_freed.result
 share/mysql-test/suite/innodb/r/temporary_table.result
 share/mysql-test/suite/innodb/r/temporary_table_optimization.result
 share/mysql-test/suite/innodb/r/tmpdir.result
@@ -9702,24 +10257,36 @@ share/mysql-test/suite/innodb/r/truncate_foreign.result
 share/mysql-test/suite/innodb/r/truncate_missing.result
 share/mysql-test/suite/innodb/r/trx_id_future.result
 share/mysql-test/suite/innodb/r/trx_sys_t_find_lf_hash_error.result
+share/mysql-test/suite/innodb/r/undo_leak.result
+share/mysql-test/suite/innodb/r/undo_leak_fail.result
 share/mysql-test/suite/innodb/r/undo_log.result
+share/mysql-test/suite/innodb/r/undo_space_dblwr.result
 share/mysql-test/suite/innodb/r/undo_truncate.result
 share/mysql-test/suite/innodb/r/undo_truncate_recover.result
+share/mysql-test/suite/innodb/r/undo_upgrade.result
+share/mysql-test/suite/innodb/r/undo_upgrade_debug.result
 share/mysql-test/suite/innodb/r/update-cascade.result
 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_prepare_reset_supremum_lock.result
+share/mysql-test/suite/innodb/r/xa_prepare_unlock_unmodified.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/r/xa_unlock_unmodified.result
+share/mysql-test/suite/innodb/r/xap_release_locks_on_dict_stats_table.result
 share/mysql-test/suite/innodb/t/
 share/mysql-test/suite/innodb/t/101_compatibility.test
 share/mysql-test/suite/innodb/t/add_constraint.test
+share/mysql-test/suite/innodb/t/add_foreign_key.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_copy_bulk.combinations
+share/mysql-test/suite/innodb/t/alter_copy_bulk.test
 share/mysql-test/suite/innodb/t/alter_crash.opt
 share/mysql-test/suite/innodb/t/alter_crash.test
 share/mysql-test/suite/innodb/t/alter_crash_rebuild.test
@@ -9755,6 +10322,7 @@ share/mysql-test/suite/innodb/t/analyze_table.test
 share/mysql-test/suite/innodb/t/auto_increment_dup.opt
 share/mysql-test/suite/innodb/t/auto_increment_dup.test
 share/mysql-test/suite/innodb/t/autoinc_debug.test
+share/mysql-test/suite/innodb/t/autoinc_import.test
 share/mysql-test/suite/innodb/t/autoinc_persist.combinations
 share/mysql-test/suite/innodb/t/autoinc_persist.test
 share/mysql-test/suite/innodb/t/binlog_consistent.test
@@ -9764,6 +10332,7 @@ share/mysql-test/suite/innodb/t/blob_cmp_empty.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/cascade_lock_wait.test
 share/mysql-test/suite/innodb/t/change_column_collation.test
 share/mysql-test/suite/innodb/t/check_ibd_filesize.test
 share/mysql-test/suite/innodb/t/compression_providers_loaded.combinations
@@ -9776,9 +10345,11 @@ share/mysql-test/suite/innodb/t/count_distinct.test
 share/mysql-test/suite/innodb/t/create-index.test
 share/mysql-test/suite/innodb/t/create_isl_with_direct.opt
 share/mysql-test/suite/innodb/t/create_isl_with_direct.test
+share/mysql-test/suite/innodb/t/create_like.test
 share/mysql-test/suite/innodb/t/create_select.test
 share/mysql-test/suite/innodb/t/create_table_insert_skip_locked.test
 share/mysql-test/suite/innodb/t/cursor-restore-locking.test
+share/mysql-test/suite/innodb/t/cursor-restore-unique-null.test
 share/mysql-test/suite/innodb/t/data_types.opt
 share/mysql-test/suite/innodb/t/data_types.test
 share/mysql-test/suite/innodb/t/ddl_purge.test
@@ -9794,10 +10365,11 @@ share/mysql-test/suite/innodb/t/deadlock_wait_thr_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
-share/mysql-test/suite/innodb/t/defrag_mdl-9155.test
 share/mysql-test/suite/innodb/t/dml_purge.test
 share/mysql-test/suite/innodb/t/doublewrite.combinations
 share/mysql-test/suite/innodb/t/doublewrite.test
+share/mysql-test/suite/innodb/t/doublewrite_debug.combinations
+share/mysql-test/suite/innodb/t/doublewrite_debug.test
 share/mysql-test/suite/innodb/t/dropdb.test
 share/mysql-test/suite/innodb/t/dropdb_cs.test
 share/mysql-test/suite/innodb/t/encryption_threads_shutdown.opt
@@ -9805,6 +10377,7 @@ share/mysql-test/suite/innodb/t/encryption_threads_shutdown.test
 share/mysql-test/suite/innodb/t/evict_tables_on_commit_debug.test
 share/mysql-test/suite/innodb/t/file_format_defaults.test
 share/mysql-test/suite/innodb/t/fk_col_alter.test
+share/mysql-test/suite/innodb/t/fk_drop_alter.test
 share/mysql-test/suite/innodb/t/flush.opt
 share/mysql-test/suite/innodb/t/flush.test
 share/mysql-test/suite/innodb/t/foreign-keys.test
@@ -9812,6 +10385,8 @@ share/mysql-test/suite/innodb/t/foreign_key.combinations
 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/foreign_key_not_windows.test
+share/mysql-test/suite/innodb/t/foreign_null.combinations
+share/mysql-test/suite/innodb/t/foreign_null.test
 share/mysql-test/suite/innodb/t/full_crc32_import.test
 share/mysql-test/suite/innodb/t/gap_lock_split.test
 share/mysql-test/suite/innodb/t/gap_locks.test
@@ -9829,13 +10404,18 @@ share/mysql-test/suite/innodb/t/group_commit_force_recovery.test
 share/mysql-test/suite/innodb/t/group_commit_no_optimize_thread-master.opt
 share/mysql-test/suite/innodb/t/group_commit_no_optimize_thread.test
 share/mysql-test/suite/innodb/t/help_url.test
-share/mysql-test/suite/innodb/t/ibuf_delete.test
-share/mysql-test/suite/innodb/t/ibuf_not_empty.combinations
-share/mysql-test/suite/innodb/t/ibuf_not_empty.test
 share/mysql-test/suite/innodb/t/implicit_gap_lock_convertion.test
+share/mysql-test/suite/innodb/t/import.test
 share/mysql-test/suite/innodb/t/import_bugs.test
 share/mysql-test/suite/innodb/t/import_corrupted.test
+share/mysql-test/suite/innodb/t/import_hidden_fts.test
+share/mysql-test/suite/innodb/t/import_hidden_fts_debug.test
+share/mysql-test/suite/innodb/t/import_no_cfg.test
+share/mysql-test/suite/innodb/t/import_recovery.test
+share/mysql-test/suite/innodb/t/import_run_once.test
 share/mysql-test/suite/innodb/t/import_tablespace_race.test
+share/mysql-test/suite/innodb/t/import_update_stats.test
+share/mysql-test/suite/innodb/t/index_length.test
 share/mysql-test/suite/innodb/t/index_merge_threshold.opt
 share/mysql-test/suite/innodb/t/index_merge_threshold.test
 share/mysql-test/suite/innodb/t/index_tree_operation.opt
@@ -9853,6 +10433,7 @@ share/mysql-test/suite/innodb/t/innodb-64k-crash-master.opt
 share/mysql-test/suite/innodb/t/innodb-64k-crash.test
 share/mysql-test/suite/innodb/t/innodb-64k-master.opt
 share/mysql-test/suite/innodb/t/innodb-64k.test
+share/mysql-test/suite/innodb/t/innodb-ac-non-locking-select.test
 share/mysql-test/suite/innodb/t/innodb-agregate.test
 share/mysql-test/suite/innodb/t/innodb-alter-autoinc.test
 share/mysql-test/suite/innodb/t/innodb-alter-debug.test
@@ -9903,8 +10484,8 @@ share/mysql-test/suite/innodb/t/innodb-index.test
 share/mysql-test/suite/innodb/t/innodb-index_ucs2.opt
 share/mysql-test/suite/innodb/t/innodb-index_ucs2.test
 share/mysql-test/suite/innodb/t/innodb-isolation.test
+share/mysql-test/suite/innodb/t/innodb-lock-inherit-read_commited.test
 share/mysql-test/suite/innodb/t/innodb-lock.test
-share/mysql-test/suite/innodb/t/innodb-lru-force-no-free-page.test
 share/mysql-test/suite/innodb/t/innodb-master.opt
 share/mysql-test/suite/innodb/t/innodb-mdev-7408.opt
 share/mysql-test/suite/innodb/t/innodb-mdev-7408.test
@@ -9913,6 +10494,7 @@ share/mysql-test/suite/innodb/t/innodb-mdev-7513.test
 share/mysql-test/suite/innodb/t/innodb-mdev7046.test
 share/mysql-test/suite/innodb/t/innodb-on-duplicate-update.test
 share/mysql-test/suite/innodb/t/innodb-online-alter-gis.test
+share/mysql-test/suite/innodb/t/innodb-page_compression_none.test
 share/mysql-test/suite/innodb/t/innodb-read-view.test
 share/mysql-test/suite/innodb/t/innodb-replace-debug.test
 share/mysql-test/suite/innodb/t/innodb-replace.test
@@ -9941,7 +10523,6 @@ share/mysql-test/suite/innodb/t/innodb-wl5522.test
 share/mysql-test/suite/innodb/t/innodb-wl5980-alter.opt
 share/mysql-test/suite/innodb/t/innodb-wl5980-alter.test
 share/mysql-test/suite/innodb/t/innodb-xa.test
-share/mysql-test/suite/innodb/t/innodb.opt
 share/mysql-test/suite/innodb/t/innodb.test
 share/mysql-test/suite/innodb/t/innodb_28867993.test
 share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
@@ -9961,7 +10542,6 @@ share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
 share/mysql-test/suite/innodb/t/innodb_bug11754376.test
 share/mysql-test/suite/innodb/t/innodb_bug12400341.test
 share/mysql-test/suite/innodb/t/innodb_bug12661768.test
-share/mysql-test/suite/innodb/t/innodb_bug12902967.test
 share/mysql-test/suite/innodb/t/innodb_bug13510739.test
 share/mysql-test/suite/innodb/t/innodb_bug14007649.test
 share/mysql-test/suite/innodb/t/innodb_bug14147491-master.opt
@@ -9977,7 +10557,6 @@ share/mysql-test/suite/innodb/t/innodb_bug30919.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
-share/mysql-test/suite/innodb/t/innodb_bug39438-master.opt
 share/mysql-test/suite/innodb/t/innodb_bug39438.test
 share/mysql-test/suite/innodb/t/innodb_bug40360.test
 share/mysql-test/suite/innodb/t/innodb_bug40565.test
@@ -10015,7 +10594,6 @@ share/mysql-test/suite/innodb/t/innodb_bug57904.test
 share/mysql-test/suite/innodb/t/innodb_bug59307.test
 share/mysql-test/suite/innodb/t/innodb_bug59410.test
 share/mysql-test/suite/innodb/t/innodb_bug59641.test
-share/mysql-test/suite/innodb/t/innodb_bug59733.test
 share/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
 share/mysql-test/suite/innodb/t/innodb_bug60196.test
 share/mysql-test/suite/innodb/t/innodb_bug60229.test
@@ -10036,22 +10614,13 @@ share/mysql-test/suite/innodb/t/innodb_ctype_tis620.test
 share/mysql-test/suite/innodb/t/innodb_ctype_utf8.test
 share/mysql-test/suite/innodb/t/innodb_default_row_format.combinations
 share/mysql-test/suite/innodb/t/innodb_default_row_format.inc
-share/mysql-test/suite/innodb/t/innodb_defrag_binlog.opt
-share/mysql-test/suite/innodb/t/innodb_defrag_binlog.test
-share/mysql-test/suite/innodb/t/innodb_defrag_concurrent.opt
-share/mysql-test/suite/innodb/t/innodb_defrag_concurrent.test
-share/mysql-test/suite/innodb/t/innodb_defrag_stats.opt
-share/mysql-test/suite/innodb/t/innodb_defrag_stats.test
-share/mysql-test/suite/innodb/t/innodb_defrag_stats_many_tables.opt
-share/mysql-test/suite/innodb/t/innodb_defrag_stats_many_tables.test
-share/mysql-test/suite/innodb/t/innodb_defragment.opt
-share/mysql-test/suite/innodb/t/innodb_defragment.test
-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_i_s_innodb_locks.test
+share/mysql-test/suite/innodb/t/innodb_i_s_innodb_trx.test
 share/mysql-test/suite/innodb/t/innodb_information_schema.test
 share/mysql-test/suite/innodb/t/innodb_information_schema_buffer.opt
 share/mysql-test/suite/innodb/t/innodb_information_schema_buffer.test
@@ -10076,16 +10645,33 @@ share/mysql-test/suite/innodb/t/innodb_scrub.test
 share/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.opt
 share/mysql-test/suite/innodb/t/innodb_skip_innodb_is_tables.test
 share/mysql-test/suite/innodb/t/innodb_stats.test
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc.opt
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc.test
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_ddl.opt
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_ddl.test
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_lots.opt
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_lots.test
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.opt
+share/mysql-test/suite/innodb/t/innodb_stats_auto_recalc_on_nonexistent.test
 share/mysql-test/suite/innodb/t/innodb_stats_create_on_corrupted.test
 share/mysql-test/suite/innodb/t/innodb_stats_create_table.test
 share/mysql-test/suite/innodb/t/innodb_stats_drop_locked.test
+share/mysql-test/suite/innodb/t/innodb_stats_external_pages.test
+share/mysql-test/suite/innodb/t/innodb_stats_fetch.opt
 share/mysql-test/suite/innodb/t/innodb_stats_fetch.test
 share/mysql-test/suite/innodb/t/innodb_stats_fetch_corrupted.test
 share/mysql-test/suite/innodb/t/innodb_stats_fetch_nonexistent.test
+share/mysql-test/suite/innodb/t/innodb_stats_flag_global.combinations
+share/mysql-test/suite/innodb/t/innodb_stats_flag_global.test
+share/mysql-test/suite/innodb/t/innodb_stats_flag_global_analyze.inc
 share/mysql-test/suite/innodb/t/innodb_stats_persistent.test
 share/mysql-test/suite/innodb/t/innodb_stats_persistent_debug.test
 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_stats_sample_pages.opt
+share/mysql-test/suite/innodb/t/innodb_stats_sample_pages.test
+share/mysql-test/suite/innodb/t/innodb_stats_table_flag_auto_recalc.test
+share/mysql-test/suite/innodb/t/innodb_stats_table_flag_sample_pages.test
 share/mysql-test/suite/innodb/t/innodb_status_variables.test
 share/mysql-test/suite/innodb/t/innodb_sys_var_valgrind.test
 share/mysql-test/suite/innodb/t/innodb_timeout_rollback-master.opt
@@ -10124,24 +10710,31 @@ share/mysql-test/suite/innodb/t/leaf_page_corrupted_during_recovery.test
 share/mysql-test/suite/innodb/t/lock_delete_updated.test
 share/mysql-test/suite/innodb/t/lock_deleted.test
 share/mysql-test/suite/innodb/t/lock_insert_into_empty.test
+share/mysql-test/suite/innodb/t/lock_isolation.test
+share/mysql-test/suite/innodb/t/lock_memory.test
+share/mysql-test/suite/innodb/t/lock_memory_debug.opt
+share/mysql-test/suite/innodb/t/lock_memory_debug.test
 share/mysql-test/suite/innodb/t/lock_move_wait_lock_race.test
+share/mysql-test/suite/innodb/t/lock_release.test
 share/mysql-test/suite/innodb/t/lock_update_split_rc.test
 share/mysql-test/suite/innodb/t/log_corruption.test
 share/mysql-test/suite/innodb/t/log_data_file_size.opt
 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_overwrite.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/log_upgrade.test
+share/mysql-test/suite/innodb/t/log_upgrade_101_flags.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
 share/mysql-test/suite/innodb/t/mdev-14846.test
-share/mysql-test/suite/innodb/t/mdev-15707.opt
-share/mysql-test/suite/innodb/t/mdev-15707.test
+share/mysql-test/suite/innodb/t/mem_pressure.test
 share/mysql-test/suite/innodb/t/missing_tablespaces.test
+share/mysql-test/suite/innodb/t/mon_lock_wait_current_count.test
 share/mysql-test/suite/innodb/t/monitor.test
 share/mysql-test/suite/innodb/t/multi_repair-7404.test
 share/mysql-test/suite/innodb/t/mvcc.test
@@ -10149,17 +10742,21 @@ share/mysql-test/suite/innodb/t/mvcc_secondary.test
 share/mysql-test/suite/innodb/t/no_pad.test
 share/mysql-test/suite/innodb/t/online_table_rebuild.opt
 share/mysql-test/suite/innodb/t/online_table_rebuild.test
+share/mysql-test/suite/innodb/t/open_files_limit.opt
+share/mysql-test/suite/innodb/t/open_files_limit.test
 share/mysql-test/suite/innodb/t/page_cleaner.test
+share/mysql-test/suite/innodb/t/page_compression_windows.opt
+share/mysql-test/suite/innodb/t/page_compression_windows.test
 share/mysql-test/suite/innodb/t/page_id_innochecksum.test
 share/mysql-test/suite/innodb/t/page_reorganize.test
 share/mysql-test/suite/innodb/t/partition_locking.test
 share/mysql-test/suite/innodb/t/purge.test
 share/mysql-test/suite/innodb/t/purge_secondary.opt
 share/mysql-test/suite/innodb/t/purge_secondary.test
-share/mysql-test/suite/innodb/t/purge_thread_shutdown.test
 share/mysql-test/suite/innodb/t/read_only_recover_committed.test
 share/mysql-test/suite/innodb/t/read_only_recovery.test
 share/mysql-test/suite/innodb/t/readahead.test
+share/mysql-test/suite/innodb/t/records_in_range.test
 share/mysql-test/suite/innodb/t/recovery_memory.opt
 share/mysql-test/suite/innodb/t/recovery_memory.test
 share/mysql-test/suite/innodb/t/recovery_shutdown.test
@@ -10171,6 +10768,8 @@ share/mysql-test/suite/innodb/t/row_format_redundant.opt
 share/mysql-test/suite/innodb/t/row_format_redundant.test
 share/mysql-test/suite/innodb/t/row_lock.test
 share/mysql-test/suite/innodb/t/row_size_error_log_warnings_3.test
+share/mysql-test/suite/innodb/t/scrub.test
+share/mysql-test/suite/innodb/t/scrub_debug.test
 share/mysql-test/suite/innodb/t/skip_locked_nowait.test
 share/mysql-test/suite/innodb/t/skip_symbolic_links.opt
 share/mysql-test/suite/innodb/t/skip_symbolic_links.test
@@ -10181,6 +10780,16 @@ 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/sys_truncate.opt
+share/mysql-test/suite/innodb/t/sys_truncate.test
+share/mysql-test/suite/innodb/t/sys_truncate_debug.opt
+share/mysql-test/suite/innodb/t/sys_truncate_debug.test
+share/mysql-test/suite/innodb/t/sys_truncate_large.opt
+share/mysql-test/suite/innodb/t/sys_truncate_large.test
+share/mysql-test/suite/innodb/t/sys_truncate_shutdown.opt
+share/mysql-test/suite/innodb/t/sys_truncate_shutdown.test
+share/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.opt
+share/mysql-test/suite/innodb/t/sys_truncate_shutdown_debug.test
 share/mysql-test/suite/innodb/t/system_tables.test
 share/mysql-test/suite/innodb/t/table_definition_cache_debug.opt
 share/mysql-test/suite/innodb/t/table_definition_cache_debug.test
@@ -10189,8 +10798,17 @@ share/mysql-test/suite/innodb/t/table_flags.opt
 share/mysql-test/suite/innodb/t/table_flags.test
 share/mysql-test/suite/innodb/t/table_index_statistics.inc
 share/mysql-test/suite/innodb/t/table_index_statistics.test
+share/mysql-test/suite/innodb/t/tablespace_per_table_not_windows.opt
+share/mysql-test/suite/innodb/t/tablespace_per_table_not_windows.test
+share/mysql-test/suite/innodb/t/tablespace_per_table_windows.opt
+share/mysql-test/suite/innodb/t/tablespace_per_table_windows.test
 share/mysql-test/suite/innodb/t/temp_table.test
 share/mysql-test/suite/innodb/t/temp_table_savepoint.test
+share/mysql-test/suite/innodb/t/temp_truncate.opt
+share/mysql-test/suite/innodb/t/temp_truncate.test
+share/mysql-test/suite/innodb/t/temp_truncate_debug.opt
+share/mysql-test/suite/innodb/t/temp_truncate_debug.test
+share/mysql-test/suite/innodb/t/temp_truncate_freed.test
 share/mysql-test/suite/innodb/t/temporary_table.test
 share/mysql-test/suite/innodb/t/temporary_table_optimization.opt
 share/mysql-test/suite/innodb/t/temporary_table_optimization.test
@@ -10204,28 +10822,46 @@ share/mysql-test/suite/innodb/t/truncate_missing.test
 share/mysql-test/suite/innodb/t/trx_id_future.combinations
 share/mysql-test/suite/innodb/t/trx_id_future.test
 share/mysql-test/suite/innodb/t/trx_sys_t_find_lf_hash_error.test
+share/mysql-test/suite/innodb/t/undo_leak.opt
+share/mysql-test/suite/innodb/t/undo_leak.test
+share/mysql-test/suite/innodb/t/undo_leak_fail.opt
+share/mysql-test/suite/innodb/t/undo_leak_fail.test
 share/mysql-test/suite/innodb/t/undo_log.test
+share/mysql-test/suite/innodb/t/undo_space_dblwr.opt
+share/mysql-test/suite/innodb/t/undo_space_dblwr.test
 share/mysql-test/suite/innodb/t/undo_truncate.opt
 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/undo_upgrade.opt
+share/mysql-test/suite/innodb/t/undo_upgrade.test
+share/mysql-test/suite/innodb/t/undo_upgrade_debug.test
 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_prepare_reset_supremum_lock.test
+share/mysql-test/suite/innodb/t/xa_prepare_unlock_unmodified.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/t/xa_unlock_unmodified.opt
+share/mysql-test/suite/innodb/t/xa_unlock_unmodified.test
+share/mysql-test/suite/innodb/t/xap_release_locks_on_dict_stats_table.test
 share/mysql-test/suite/innodb_fts/
 share/mysql-test/suite/innodb_fts/r/
 share/mysql-test/suite/innodb_fts/r/basic.result
 share/mysql-test/suite/innodb_fts/r/bug_32831765.result
 share/mysql-test/suite/innodb_fts/r/concurrent_insert.result
 share/mysql-test/suite/innodb_fts/r/crash_recovery.result
+share/mysql-test/suite/innodb_fts/r/create,orig.rdiff
 share/mysql-test/suite/innodb_fts/r/create.result
+share/mysql-test/suite/innodb_fts/r/foreign_key_check.result
+share/mysql-test/suite/innodb_fts/r/foreign_key_update.result
 share/mysql-test/suite/innodb_fts/r/ft_result_cache_limit.result
 share/mysql-test/suite/innodb_fts/r/fts_kill_query.result
+share/mysql-test/suite/innodb_fts/r/fts_sync_commit_resiliency.result
 share/mysql-test/suite/innodb_fts/r/fulltext.result
 share/mysql-test/suite/innodb_fts/r/fulltext2.result
 share/mysql-test/suite/innodb_fts/r/fulltext3.result
@@ -10237,7 +10873,12 @@ share/mysql-test/suite/innodb_fts/r/fulltext_multi.result
 share/mysql-test/suite/innodb_fts/r/fulltext_order_by.result
 share/mysql-test/suite/innodb_fts/r/fulltext_update.result
 share/mysql-test/suite/innodb_fts/r/fulltext_var.result
+share/mysql-test/suite/innodb_fts/r/index_table.result
+share/mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers.rdiff
+share/mysql-test/suite/innodb_fts/r/innodb-fts-ddl,vers_trx.rdiff
 share/mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result
+share/mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers.rdiff
+share/mysql-test/suite/innodb_fts/r/innodb-fts-fic,vers_trx.rdiff
 share/mysql-test/suite/innodb_fts/r/innodb-fts-fic.result
 share/mysql-test/suite/innodb_fts/r/innodb_ft_aux_table.result
 share/mysql-test/suite/innodb_fts/r/innodb_fts_large_records.result
@@ -10249,12 +10890,26 @@ share/mysql-test/suite/innodb_fts/r/innodb_fts_proximity.result
 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/limit_union.result
+share/mysql-test/suite/innodb_fts/r/misc.result
+share/mysql-test/suite/innodb_fts/r/misc_1.result
+share/mysql-test/suite/innodb_fts/r/misc_debug,vers.rdiff
+share/mysql-test/suite/innodb_fts/r/misc_debug,vers_trx.rdiff
 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/multiple_index.result
+share/mysql-test/suite/innodb_fts/r/opt.result
+share/mysql-test/suite/innodb_fts/r/phrase.result
+share/mysql-test/suite/innodb_fts/r/plugin_debug.result
+share/mysql-test/suite/innodb_fts/r/result_cache_limit.result
+share/mysql-test/suite/innodb_fts/r/savepoint.result
 share/mysql-test/suite/innodb_fts/r/stopword,vers.rdiff
 share/mysql-test/suite/innodb_fts/r/stopword.result
+share/mysql-test/suite/innodb_fts/r/subexpr.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,vers.rdiff
+share/mysql-test/suite/innodb_fts/r/sync_ddl,vers_trx.rdiff
 share/mysql-test/suite/innodb_fts/r/sync_ddl.result
 share/mysql-test/suite/innodb_fts/r/versioning,prepare.result
 share/mysql-test/suite/innodb_fts/r/versioning.result
@@ -10267,8 +10922,12 @@ share/mysql-test/suite/innodb_fts/t/crash_recovery.opt
 share/mysql-test/suite/innodb_fts/t/crash_recovery.test
 share/mysql-test/suite/innodb_fts/t/create.opt
 share/mysql-test/suite/innodb_fts/t/create.test
+share/mysql-test/suite/innodb_fts/t/foreign_key_check.test
+share/mysql-test/suite/innodb_fts/t/foreign_key_update.test
 share/mysql-test/suite/innodb_fts/t/ft_result_cache_limit.test
 share/mysql-test/suite/innodb_fts/t/fts_kill_query.test
+share/mysql-test/suite/innodb_fts/t/fts_sync_commit_resiliency.opt
+share/mysql-test/suite/innodb_fts/t/fts_sync_commit_resiliency.test
 share/mysql-test/suite/innodb_fts/t/fulltext.test
 share/mysql-test/suite/innodb_fts/t/fulltext2.test
 share/mysql-test/suite/innodb_fts/t/fulltext3.test
@@ -10280,6 +10939,8 @@ share/mysql-test/suite/innodb_fts/t/fulltext_multi.test
 share/mysql-test/suite/innodb_fts/t/fulltext_order_by.test
 share/mysql-test/suite/innodb_fts/t/fulltext_update.test
 share/mysql-test/suite/innodb_fts/t/fulltext_var.test
+share/mysql-test/suite/innodb_fts/t/index_table.opt
+share/mysql-test/suite/innodb_fts/t/index_table.test
 share/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.opt
 share/mysql-test/suite/innodb_fts/t/innodb-fts-ddl.test
 share/mysql-test/suite/innodb_fts/t/innodb-fts-fic.test
@@ -10295,11 +10956,23 @@ share/mysql-test/suite/innodb_fts/t/innodb_fts_proximity.test
 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/limit_union.test
+share/mysql-test/suite/innodb_fts/t/misc.test
+share/mysql-test/suite/innodb_fts/t/misc_1.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/multiple_index.test
+share/mysql-test/suite/innodb_fts/t/opt.opt
+share/mysql-test/suite/innodb_fts/t/opt.test
+share/mysql-test/suite/innodb_fts/t/phrase.opt
+share/mysql-test/suite/innodb_fts/t/phrase.test
+share/mysql-test/suite/innodb_fts/t/plugin_debug.test
+share/mysql-test/suite/innodb_fts/t/result_cache_limit.test
+share/mysql-test/suite/innodb_fts/t/savepoint.test
 share/mysql-test/suite/innodb_fts/t/stopword.inc
 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/subexpr.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
@@ -10338,6 +11011,7 @@ share/mysql-test/suite/innodb_gis/r/rtree_debug.result
 share/mysql-test/suite/innodb_gis/r/rtree_drop_index.result
 share/mysql-test/suite/innodb_gis/r/rtree_estimate.result
 share/mysql-test/suite/innodb_gis/r/rtree_multi_pk.result
+share/mysql-test/suite/innodb_gis/r/rtree_optimize.result
 share/mysql-test/suite/innodb_gis/r/rtree_purge.result
 share/mysql-test/suite/innodb_gis/r/rtree_recovery.result
 share/mysql-test/suite/innodb_gis/r/rtree_rollback1.result
@@ -10375,11 +11049,13 @@ share/mysql-test/suite/innodb_gis/t/rtree_add_index.test
 share/mysql-test/suite/innodb_gis/t/rtree_compress.test
 share/mysql-test/suite/innodb_gis/t/rtree_compress2.test
 share/mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test
+share/mysql-test/suite/innodb_gis/t/rtree_create_inplace.opt
 share/mysql-test/suite/innodb_gis/t/rtree_create_inplace.test
 share/mysql-test/suite/innodb_gis/t/rtree_debug.test
 share/mysql-test/suite/innodb_gis/t/rtree_drop_index.test
 share/mysql-test/suite/innodb_gis/t/rtree_estimate.test
 share/mysql-test/suite/innodb_gis/t/rtree_multi_pk.test
+share/mysql-test/suite/innodb_gis/t/rtree_optimize.test
 share/mysql-test/suite/innodb_gis/t/rtree_purge.test
 share/mysql-test/suite/innodb_gis/t/rtree_recovery.test
 share/mysql-test/suite/innodb_gis/t/rtree_rollback1.test
@@ -10469,7 +11145,6 @@ share/mysql-test/suite/innodb_zip/
 share/mysql-test/suite/innodb_zip/include/
 share/mysql-test/suite/innodb_zip/include/have_no_undo_tablespaces.inc
 share/mysql-test/suite/innodb_zip/include/innodb_create_tab_indx.inc
-share/mysql-test/suite/innodb_zip/include/innodb_dml_ops.inc
 share/mysql-test/suite/innodb_zip/include/innodb_fetch_records.inc
 share/mysql-test/suite/innodb_zip/include/innodb_load_data.inc
 share/mysql-test/suite/innodb_zip/include/innodb_stats_comp_index.inc
@@ -10837,9 +11512,13 @@ 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/crash-recursive.result
+share/mysql-test/suite/maria/crash-recursive.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/ctype_utf8mb3_uca.result
+share/mysql-test/suite/maria/ctype_utf8mb3_uca.test
 share/mysql-test/suite/maria/disabled.def
 share/mysql-test/suite/maria/distinct.result
 share/mysql-test/suite/maria/distinct.test
@@ -10943,6 +11622,8 @@ share/mysql-test/suite/maria/partition.result
 share/mysql-test/suite/maria/partition.test
 share/mysql-test/suite/maria/ps_maria.result
 share/mysql-test/suite/maria/ps_maria.test
+share/mysql-test/suite/maria/range.result
+share/mysql-test/suite/maria/range.test
 share/mysql-test/suite/maria/repair-big-sort.result
 share/mysql-test/suite/maria/repair-big-sort.test
 share/mysql-test/suite/maria/repair.result
@@ -10974,10 +11655,17 @@ share/mysql-test/suite/mariabackup/apply-log-only-incr.result
 share/mysql-test/suite/mariabackup/apply-log-only-incr.test
 share/mysql-test/suite/mariabackup/apply-log-only.result
 share/mysql-test/suite/mariabackup/apply-log-only.test
+share/mysql-test/suite/mariabackup/aria_backup.opt
+share/mysql-test/suite/mariabackup/aria_backup.result
+share/mysql-test/suite/mariabackup/aria_backup.test
+share/mysql-test/suite/mariabackup/aria_log.opt
 share/mysql-test/suite/mariabackup/aria_log_dir_path.result
 share/mysql-test/suite/mariabackup/aria_log_dir_path.test
 share/mysql-test/suite/mariabackup/aria_log_dir_path_rel.result
 share/mysql-test/suite/mariabackup/aria_log_dir_path_rel.test
+share/mysql-test/suite/mariabackup/aria_log_rotate_during_backup.opt
+share/mysql-test/suite/mariabackup/aria_log_rotate_during_backup.result
+share/mysql-test/suite/mariabackup/aria_log_rotate_during_backup.test
 share/mysql-test/suite/mariabackup/auth_plugin_win.opt
 share/mysql-test/suite/mariabackup/auth_plugin_win.result
 share/mysql-test/suite/mariabackup/auth_plugin_win.test
@@ -10987,10 +11675,14 @@ 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/backup_ssl_not_win.result
+share/mysql-test/suite/mariabackup/backup_ssl_not_win.test
 share/mysql-test/suite/mariabackup/big_innodb_log.result
 share/mysql-test/suite/mariabackup/big_innodb_log.test
 share/mysql-test/suite/mariabackup/binlog.result
 share/mysql-test/suite/mariabackup/binlog.test
+share/mysql-test/suite/mariabackup/compat_xtrabackup.result
+share/mysql-test/suite/mariabackup/compat_xtrabackup.test
 share/mysql-test/suite/mariabackup/compress_qpress.result
 share/mysql-test/suite/mariabackup/compress_qpress.test
 share/mysql-test/suite/mariabackup/compression_providers_loaded,lz4.rdiff
@@ -11013,11 +11705,16 @@ 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_for_common_engine.result
+share/mysql-test/suite/mariabackup/ddl_for_common_engine.test
 share/mysql-test/suite/mariabackup/defer_space.result
 share/mysql-test/suite/mariabackup/defer_space.test
 share/mysql-test/suite/mariabackup/disabled.def
 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_export.opt
+share/mysql-test/suite/mariabackup/encrypted_export.result
+share/mysql-test/suite/mariabackup/encrypted_export.test
 share/mysql-test/suite/mariabackup/encrypted_page_compressed.opt
 share/mysql-test/suite/mariabackup/encrypted_page_compressed.result
 share/mysql-test/suite/mariabackup/encrypted_page_compressed.test
@@ -11071,6 +11768,8 @@ share/mysql-test/suite/mariabackup/incremental_page_compressed.test
 share/mysql-test/suite/mariabackup/incremental_rocksdb.opt
 share/mysql-test/suite/mariabackup/incremental_rocksdb.result
 share/mysql-test/suite/mariabackup/incremental_rocksdb.test
+share/mysql-test/suite/mariabackup/innodb_ddl_on_intermediate_table.result
+share/mysql-test/suite/mariabackup/innodb_ddl_on_intermediate_table.test
 share/mysql-test/suite/mariabackup/innodb_force_recovery.result
 share/mysql-test/suite/mariabackup/innodb_force_recovery.test
 share/mysql-test/suite/mariabackup/innodb_redo_log_overwrite.opt
@@ -11086,9 +11785,13 @@ share/mysql-test/suite/mariabackup/log_checksum_mismatch.result
 share/mysql-test/suite/mariabackup/log_checksum_mismatch.test
 share/mysql-test/suite/mariabackup/log_copy_interval.result
 share/mysql-test/suite/mariabackup/log_copy_interval.test
+share/mysql-test/suite/mariabackup/log_file_unexpected_large_number_in_name.result
+share/mysql-test/suite/mariabackup/log_file_unexpected_large_number_in_name.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/log_tables.result
+share/mysql-test/suite/mariabackup/log_tables.test
 share/mysql-test/suite/mariabackup/mdev-14447.combinations
 share/mysql-test/suite/mariabackup/mdev-14447.opt
 share/mysql-test/suite/mariabackup/mdev-14447.result
@@ -11124,6 +11827,8 @@ 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/row_format_redundant.result
 share/mysql-test/suite/mariabackup/row_format_redundant.test
+share/mysql-test/suite/mariabackup/rpl_clone_slave.result
+share/mysql-test/suite/mariabackup/rpl_clone_slave.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
@@ -11131,10 +11836,18 @@ share/mysql-test/suite/mariabackup/skip_innodb.result
 share/mysql-test/suite/mariabackup/skip_innodb.test
 share/mysql-test/suite/mariabackup/slave_info_norpl.result
 share/mysql-test/suite/mariabackup/slave_info_norpl.test
+share/mysql-test/suite/mariabackup/slave_provision_nolock.cnf
+share/mysql-test/suite/mariabackup/slave_provision_nolock.result
+share/mysql-test/suite/mariabackup/slave_provision_nolock.test
 share/mysql-test/suite/mariabackup/small_ibd.result
 share/mysql-test/suite/mariabackup/small_ibd.test
+share/mysql-test/suite/mariabackup/std_data/
+share/mysql-test/suite/mariabackup/std_data/ment1587_aria_log.00000004
 share/mysql-test/suite/mariabackup/suite.opt
 share/mysql-test/suite/mariabackup/suite.pm
+share/mysql-test/suite/mariabackup/sys_truncate.opt
+share/mysql-test/suite/mariabackup/sys_truncate.result
+share/mysql-test/suite/mariabackup/sys_truncate.test
 share/mysql-test/suite/mariabackup/system_versioning.result
 share/mysql-test/suite/mariabackup/system_versioning.test
 share/mysql-test/suite/mariabackup/truncate_during_backup.result
@@ -11142,6 +11855,8 @@ share/mysql-test/suite/mariabackup/truncate_during_backup.test
 share/mysql-test/suite/mariabackup/undo_space_id.opt
 share/mysql-test/suite/mariabackup/undo_space_id.result
 share/mysql-test/suite/mariabackup/undo_space_id.test
+share/mysql-test/suite/mariabackup/undo_upgrade.result
+share/mysql-test/suite/mariabackup/undo_upgrade.test
 share/mysql-test/suite/mariabackup/unencrypted_page_compressed.result
 share/mysql-test/suite/mariabackup/unencrypted_page_compressed.test
 share/mysql-test/suite/mariabackup/unsupported_redo.result
@@ -11175,6 +11890,18 @@ share/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.result
 share/mysql-test/suite/mariabackup/xb_rocksdb_datadir_debug.test
 share/mysql-test/suite/mariabackup/xbstream.result
 share/mysql-test/suite/mariabackup/xbstream.test
+share/mysql-test/suite/merge/
+share/mysql-test/suite/merge/alter_table.result
+share/mysql-test/suite/merge/alter_table.test
+share/mysql-test/suite/merge/merge.result
+share/mysql-test/suite/merge/merge.test
+share/mysql-test/suite/merge/merge_debug.result
+share/mysql-test/suite/merge/merge_debug.test
+share/mysql-test/suite/merge/merge_innodb.result
+share/mysql-test/suite/merge/merge_innodb.test
+share/mysql-test/suite/merge/merge_mmap-master.opt
+share/mysql-test/suite/merge/merge_mmap.result
+share/mysql-test/suite/merge/merge_mmap.test
 share/mysql-test/suite/mtr/
 share/mysql-test/suite/mtr/t/
 share/mysql-test/suite/mtr/t/combs.combinations
@@ -11240,6 +11967,9 @@ share/mysql-test/suite/multi_source/multisource_for_channel.test
 share/mysql-test/suite/multi_source/my.cnf
 share/mysql-test/suite/multi_source/relaylog_events.result
 share/mysql-test/suite/multi_source/relaylog_events.test
+share/mysql-test/suite/multi_source/replicate_rewrite_db_dynamic.cnf
+share/mysql-test/suite/multi_source/replicate_rewrite_db_dynamic.result
+share/mysql-test/suite/multi_source/replicate_rewrite_db_dynamic.test
 share/mysql-test/suite/multi_source/reset_slave.result
 share/mysql-test/suite/multi_source/reset_slave.test
 share/mysql-test/suite/multi_source/simple.result
@@ -11420,6 +12150,8 @@ share/mysql-test/suite/parts/r/engine_defined_part_attributes.result
 share/mysql-test/suite/parts/r/fulltext.result
 share/mysql-test/suite/parts/r/insert_ignore-5421.result
 share/mysql-test/suite/parts/r/longname.result
+share/mysql-test/suite/parts/r/mdev_21007.result
+share/mysql-test/suite/parts/r/mdev_24610.result
 share/mysql-test/suite/parts/r/optimizer.result
 share/mysql-test/suite/parts/r/part_blocked_sql_func_innodb.result
 share/mysql-test/suite/parts/r/part_blocked_sql_func_myisam.result
@@ -11568,6 +12300,8 @@ share/mysql-test/suite/parts/t/engine_defined_part_attributes.test
 share/mysql-test/suite/parts/t/fulltext.test
 share/mysql-test/suite/parts/t/insert_ignore-5421.test
 share/mysql-test/suite/parts/t/longname.test
+share/mysql-test/suite/parts/t/mdev_21007.test
+share/mysql-test/suite/parts/t/mdev_24610.test
 share/mysql-test/suite/parts/t/optimizer.test
 share/mysql-test/suite/parts/t/part_blocked_sql_func_innodb.test
 share/mysql-test/suite/parts/t/part_blocked_sql_func_myisam.test
@@ -11619,7 +12353,6 @@ share/mysql-test/suite/parts/t/partition_datetime_myisam.test
 share/mysql-test/suite/parts/t/partition_debug.test
 share/mysql-test/suite/parts/t/partition_debug_innodb-master.opt
 share/mysql-test/suite/parts/t/partition_debug_innodb.test
-share/mysql-test/suite/parts/t/partition_debug_sync_innodb-master.opt
 share/mysql-test/suite/parts/t/partition_debug_sync_innodb.test
 share/mysql-test/suite/parts/t/partition_decimal_innodb.test
 share/mysql-test/suite/parts/t/partition_decimal_myisam.test
@@ -11687,7 +12420,7 @@ share/mysql-test/suite/parts/t/partition_mgm_lc2_myisam.test
 share/mysql-test/suite/parts/t/partition_open.test
 share/mysql-test/suite/parts/t/partition_purge.opt
 share/mysql-test/suite/parts/t/partition_purge.test
-share/mysql-test/suite/parts/t/partition_recover_myisam-master.opt
+share/mysql-test/suite/parts/t/partition_recover_myisam.opt
 share/mysql-test/suite/parts/t/partition_recover_myisam.test
 share/mysql-test/suite/parts/t/partition_repair_myisam-master.opt
 share/mysql-test/suite/parts/t/partition_repair_myisam.test
@@ -11993,7 +12726,6 @@ share/mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
 share/mysql-test/suite/perfschema/r/event_aggregate_no_h.result
 share/mysql-test/suite/perfschema/r/event_aggregate_no_u.result
 share/mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
-share/mysql-test/suite/perfschema/r/events_waits_current_MDEV-29091.result
 share/mysql-test/suite/perfschema/r/file_misc.result
 share/mysql-test/suite/perfschema/r/func_file_io.result
 share/mysql-test/suite/perfschema/r/func_mutex.result
@@ -12057,6 +12789,7 @@ share/mysql-test/suite/perfschema/r/memory_table_io.result
 share/mysql-test/suite/perfschema/r/merge_table_io.result
 share/mysql-test/suite/perfschema/r/misc.result
 share/mysql-test/suite/perfschema/r/misc_global_status.result
+share/mysql-test/suite/perfschema/r/misc_session_status.result
 share/mysql-test/suite/perfschema/r/mks_timer-6258.result
 share/mysql-test/suite/perfschema/r/multi_table_io.result
 share/mysql-test/suite/perfschema/r/myisam_file_io.result
@@ -12473,7 +13206,6 @@ share/mysql-test/suite/perfschema/t/event_aggregate_no_u-master.opt
 share/mysql-test/suite/perfschema/t/event_aggregate_no_u.test
 share/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h-master.opt
 share/mysql-test/suite/perfschema/t/event_aggregate_no_u_no_h.test
-share/mysql-test/suite/perfschema/t/events_waits_current_MDEV-29091.test
 share/mysql-test/suite/perfschema/t/file_misc-master.opt
 share/mysql-test/suite/perfschema/t/file_misc.test
 share/mysql-test/suite/perfschema/t/func_file_io.test
@@ -12569,6 +13301,7 @@ share/mysql-test/suite/perfschema/t/merge_table_io.test
 share/mysql-test/suite/perfschema/t/misc.test
 share/mysql-test/suite/perfschema/t/misc_global_status-master.opt
 share/mysql-test/suite/perfschema/t/misc_global_status.test
+share/mysql-test/suite/perfschema/t/misc_session_status.test
 share/mysql-test/suite/perfschema/t/mks_timer-6258.test
 share/mysql-test/suite/perfschema/t/multi_table_io.test
 share/mysql-test/suite/perfschema/t/myisam_file_io.opt
@@ -12858,6 +13591,8 @@ share/mysql-test/suite/period/r/alter.result
 share/mysql-test/suite/period/r/create.result
 share/mysql-test/suite/period/r/delete,myisam.rdiff
 share/mysql-test/suite/period/r/delete.result
+share/mysql-test/suite/period/r/i_s_notembedded,win.rdiff
+share/mysql-test/suite/period/r/i_s_notembedded.result
 share/mysql-test/suite/period/r/long_unique.result
 share/mysql-test/suite/period/r/overlaps.result
 share/mysql-test/suite/period/r/update.result
@@ -12866,6 +13601,7 @@ share/mysql-test/suite/period/t/
 share/mysql-test/suite/period/t/alter.test
 share/mysql-test/suite/period/t/create.test
 share/mysql-test/suite/period/t/delete.test
+share/mysql-test/suite/period/t/i_s_notembedded.test
 share/mysql-test/suite/period/t/long_unique.test
 share/mysql-test/suite/period/t/overlaps.test
 share/mysql-test/suite/period/t/update.test
@@ -12891,6 +13627,7 @@ share/mysql-test/suite/plugins/r/false_dupes-6543.result
 share/mysql-test/suite/plugins/r/feedback_plugin_install.result
 share/mysql-test/suite/plugins/r/feedback_plugin_load.result
 share/mysql-test/suite/plugins/r/feedback_plugin_send.result
+share/mysql-test/suite/plugins/r/fulltext_notembedded.result
 share/mysql-test/suite/plugins/r/fulltext_plugin.result
 share/mysql-test/suite/plugins/r/locales.result
 share/mysql-test/suite/plugins/r/max_password_errors_auth_named_pipe.result
@@ -12903,10 +13640,12 @@ share/mysql-test/suite/plugins/r/password_reuse_check.result
 share/mysql-test/suite/plugins/r/processlist.result
 share/mysql-test/suite/plugins/r/qc_info.result
 share/mysql-test/suite/plugins/r/qc_info_priv.result
+share/mysql-test/suite/plugins/r/rpl_auth.result
 share/mysql-test/suite/plugins/r/server_audit.result
 share/mysql-test/suite/plugins/r/show_all_plugins.result
 share/mysql-test/suite/plugins/r/simple_password_check.result
 share/mysql-test/suite/plugins/r/sql_error_log.result
+share/mysql-test/suite/plugins/r/sql_error_log_withdbinfo.result
 share/mysql-test/suite/plugins/r/test_sql_service.result
 share/mysql-test/suite/plugins/r/thread_pool_server_audit.result
 share/mysql-test/suite/plugins/r/two_password_validations.result
@@ -12929,6 +13668,7 @@ share/mysql-test/suite/plugins/t/feedback_plugin_install.test
 share/mysql-test/suite/plugins/t/feedback_plugin_load.opt
 share/mysql-test/suite/plugins/t/feedback_plugin_load.test
 share/mysql-test/suite/plugins/t/feedback_plugin_send.test
+share/mysql-test/suite/plugins/t/fulltext_notembedded.test
 share/mysql-test/suite/plugins/t/fulltext_plugin.test
 share/mysql-test/suite/plugins/t/locales.opt
 share/mysql-test/suite/plugins/t/locales.test
@@ -12948,11 +13688,14 @@ share/mysql-test/suite/plugins/t/qc_info.test
 share/mysql-test/suite/plugins/t/qc_info_init.inc
 share/mysql-test/suite/plugins/t/qc_info_init.opt
 share/mysql-test/suite/plugins/t/qc_info_priv.test
+share/mysql-test/suite/plugins/t/rpl_auth.test
 share/mysql-test/suite/plugins/t/server_audit.opt
 share/mysql-test/suite/plugins/t/server_audit.test
 share/mysql-test/suite/plugins/t/show_all_plugins.test
 share/mysql-test/suite/plugins/t/simple_password_check.test
 share/mysql-test/suite/plugins/t/sql_error_log.test
+share/mysql-test/suite/plugins/t/sql_error_log_withdbinfo.opt
+share/mysql-test/suite/plugins/t/sql_error_log_withdbinfo.test
 share/mysql-test/suite/plugins/t/test_sql_service.opt
 share/mysql-test/suite/plugins/t/test_sql_service.test
 share/mysql-test/suite/plugins/t/thread_pool_server_audit.opt
@@ -13042,6 +13785,9 @@ share/mysql-test/suite/roles/set_default_role_for.result
 share/mysql-test/suite/roles/set_default_role_for.test
 share/mysql-test/suite/roles/set_default_role_invalid.result
 share/mysql-test/suite/roles/set_default_role_invalid.test
+share/mysql-test/suite/roles/set_default_role_invalid_skip_name_resolve-master.opt
+share/mysql-test/suite/roles/set_default_role_invalid_skip_name_resolve.result
+share/mysql-test/suite/roles/set_default_role_invalid_skip_name_resolve.test
 share/mysql-test/suite/roles/set_default_role_new_connection.result
 share/mysql-test/suite/roles/set_default_role_new_connection.test
 share/mysql-test/suite/roles/set_default_role_ps-6960.result
@@ -13095,10 +13841,11 @@ share/mysql-test/suite/rpl/include/rpl_auto_increment.test
 share/mysql-test/suite/rpl/include/rpl_auto_increment_insert_view.test
 share/mysql-test/suite/rpl/include/rpl_auto_increment_invoke_trigger.test
 share/mysql-test/suite/rpl/include/rpl_autoinc_func_invokes_trigger.test
-share/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.test
+share/mysql-test/suite/rpl/include/rpl_binlog_max_cache_size.inc
 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_charset.test
+share/mysql-test/suite/rpl/include/rpl_change_master_demote.inc
+share/mysql-test/suite/rpl/include/rpl_charset.inc
 share/mysql-test/suite/rpl/include/rpl_check_table_consistency.inc
 share/mysql-test/suite/rpl/include/rpl_commit_after_flush.test
 share/mysql-test/suite/rpl/include/rpl_conflicts.test
@@ -13107,14 +13854,15 @@ share/mysql-test/suite/rpl/include/rpl_deadlock.test
 share/mysql-test/suite/rpl/include/rpl_delete_no_where.test
 share/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.inc
 share/mysql-test/suite/rpl/include/rpl_drop_create_temp_table.test
-share/mysql-test/suite/rpl/include/rpl_extra_col_master.test
+share/mysql-test/suite/rpl/include/rpl_extra_col_master.inc
 share/mysql-test/suite/rpl/include/rpl_extra_col_slave.test
 share/mysql-test/suite/rpl/include/rpl_failed_optimize.test
 share/mysql-test/suite/rpl/include/rpl_flsh_tbls.test
 share/mysql-test/suite/rpl/include/rpl_get_master_version_and_clock.test
+share/mysql-test/suite/rpl/include/rpl_gtid_index.inc
+share/mysql-test/suite/rpl/include/rpl_gtid_until_before_after_gtids.test
 share/mysql-test/suite/rpl/include/rpl_implicit_commit_binlog.test
 share/mysql-test/suite/rpl/include/rpl_innodb.test
-share/mysql-test/suite/rpl/include/rpl_innodb_rows_counters.inc
 share/mysql-test/suite/rpl/include/rpl_insert_delayed.test
 share/mysql-test/suite/rpl/include/rpl_insert_id.test
 share/mysql-test/suite/rpl/include/rpl_insert_id_pk.test
@@ -13169,6 +13917,7 @@ share/mysql-test/suite/rpl/include/rpl_show_binlog_events.inc
 share/mysql-test/suite/rpl/include/rpl_show_log_events_with_varying_options.inc
 share/mysql-test/suite/rpl/include/rpl_show_relaylog_events.inc
 share/mysql-test/suite/rpl/include/rpl_shutdown_wait_slaves.inc
+share/mysql-test/suite/rpl/include/rpl_slave_max_statement_time.inc
 share/mysql-test/suite/rpl/include/rpl_start_stop_slave.test
 share/mysql-test/suite/rpl/include/rpl_stm_EE_err2.test
 share/mysql-test/suite/rpl/include/rpl_stm_create_if_not_exists.test
@@ -13189,6 +13938,7 @@ 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
 share/mysql-test/suite/rpl/include/start_alter_options.inc
+share/mysql-test/suite/rpl/include/sync_with_master_sql_delay_debug_sync.inc
 share/mysql-test/suite/rpl/include/type_conversions.test
 share/mysql-test/suite/rpl/my.cnf
 share/mysql-test/suite/rpl/r/
@@ -13204,6 +13954,7 @@ share/mysql-test/suite/rpl/r/ignore_table_autoinc-9737.result
 share/mysql-test/suite/rpl/r/kill_hard-6290.result
 share/mysql-test/suite/rpl/r/kill_race_condition.result
 share/mysql-test/suite/rpl/r/last_insert_id.result
+share/mysql-test/suite/rpl/r/max_binlog_total_size.result
 share/mysql-test/suite/rpl/r/mdev-31448_kill_ooo_finish_optimistic.result
 share/mysql-test/suite/rpl/r/mdev_17588.result
 share/mysql-test/suite/rpl/r/mdev_24667.result
@@ -13214,6 +13965,7 @@ share/mysql-test/suite/rpl/r/parallel_backup_lsu_off.result
 share/mysql-test/suite/rpl/r/parallel_backup_slave_binlog_off.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/purge_binlog.result
 share/mysql-test/suite/rpl/r/rename.result
 share/mysql-test/suite/rpl/r/replace.result
 share/mysql-test/suite/rpl/r/rpl000001.a.result
@@ -13229,8 +13981,10 @@ share/mysql-test/suite/rpl/r/rpl_LD_INFILE.result
 share/mysql-test/suite/rpl/r/rpl_alter.result
 share/mysql-test/suite/rpl/r/rpl_alter_db.result
 share/mysql-test/suite/rpl/r/rpl_alter_extra_persistent.result
-share/mysql-test/suite/rpl/r/rpl_alter_instant.result
+share/mysql-test/suite/rpl/r/rpl_alter_innodb.result
+share/mysql-test/suite/rpl/r/rpl_alter_online_debug.result
 share/mysql-test/suite/rpl/r/rpl_alter_rollback.result
+share/mysql-test/suite/rpl/r/rpl_auditing.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment_11932.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment_bug33029.result
@@ -13238,6 +13992,8 @@ share/mysql-test/suite/rpl/r/rpl_auto_increment_bug45679.result
 share/mysql-test/suite/rpl/r/rpl_auto_increment_update_failure.result
 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_cache_disk_full_loaddata.result
+share/mysql-test/suite/rpl/r/rpl_binlog_cache_disk_full_row.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
@@ -13258,6 +14014,7 @@ share/mysql-test/suite/rpl/r/rpl_bug38694.result
 share/mysql-test/suite/rpl/r/rpl_bug41902.result
 share/mysql-test/suite/rpl/r/rpl_cant_read_event_incident.result
 share/mysql-test/suite/rpl/r/rpl_change_master.result
+share/mysql-test/suite/rpl/r/rpl_change_master_demote.result
 share/mysql-test/suite/rpl/r/rpl_change_master_find_log_pos_err.result
 share/mysql-test/suite/rpl/r/rpl_charset.result
 share/mysql-test/suite/rpl/r/rpl_charset_sjis.result
@@ -13287,11 +14044,12 @@ share/mysql-test/suite/rpl/r/rpl_create_or_replace_fail.result
 share/mysql-test/suite/rpl/r/rpl_create_tmp_table_if_not_exists.result
 share/mysql-test/suite/rpl/r/rpl_critical_errors.result
 share/mysql-test/suite/rpl/r/rpl_critical_errors.result.txt
-share/mysql-test/suite/rpl/r/rpl_cross_version.result
+share/mysql-test/suite/rpl/r/rpl_ctype_collate_implicit.result
 share/mysql-test/suite/rpl/r/rpl_ctype_latin1.result
 share/mysql-test/suite/rpl/r/rpl_current_user.result
 share/mysql-test/suite/rpl/r/rpl_ddl.result
 share/mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
+share/mysql-test/suite/rpl/r/rpl_deadlock_show_slave_status.result
 share/mysql-test/suite/rpl/r/rpl_default.result
 share/mysql-test/suite/rpl/r/rpl_delayed_slave,parallel.rdiff
 share/mysql-test/suite/rpl/r/rpl_delayed_slave.result
@@ -13318,6 +14076,7 @@ share/mysql-test/suite/rpl/r/rpl_events.result
 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_minimal.result
 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
@@ -13335,6 +14094,7 @@ share/mysql-test/suite/rpl/r/rpl_function_defaults.result
 share/mysql-test/suite/rpl/r/rpl_geometry.result
 share/mysql-test/suite/rpl/r/rpl_get_lock.result
 share/mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
+share/mysql-test/suite/rpl/r/rpl_gis_user_var.result
 share/mysql-test/suite/rpl/r/rpl_grant.result
 share/mysql-test/suite/rpl/r/rpl_gtid_basic.result
 share/mysql-test/suite/rpl/r/rpl_gtid_crash.result
@@ -13345,7 +14105,9 @@ share/mysql-test/suite/rpl/r/rpl_gtid_errorlog.result
 share/mysql-test/suite/rpl/r/rpl_gtid_excess_initial_delay.result
 share/mysql-test/suite/rpl/r/rpl_gtid_glle_no_terminate.result
 share/mysql-test/suite/rpl/r/rpl_gtid_grouping.result
+share/mysql-test/suite/rpl/r/rpl_gtid_header_valid.result
 share/mysql-test/suite/rpl/r/rpl_gtid_ignored.result
+share/mysql-test/suite/rpl/r/rpl_gtid_index.result
 share/mysql-test/suite/rpl/r/rpl_gtid_master_promote.result
 share/mysql-test/suite/rpl/r/rpl_gtid_mdev4473.result
 share/mysql-test/suite/rpl/r/rpl_gtid_mdev4474.result
@@ -13356,11 +14118,13 @@ share/mysql-test/suite/rpl/r/rpl_gtid_mdev9033.result
 share/mysql-test/suite/rpl/r/rpl_gtid_misc.result
 share/mysql-test/suite/rpl/r/rpl_gtid_nobinlog.result
 share/mysql-test/suite/rpl/r/rpl_gtid_reconnect.result
+share/mysql-test/suite/rpl/r/rpl_gtid_slave_filtering.result
 share/mysql-test/suite/rpl/r/rpl_gtid_sort.result
 share/mysql-test/suite/rpl/r/rpl_gtid_startpos.result
 share/mysql-test/suite/rpl/r/rpl_gtid_stop_start.result
 share/mysql-test/suite/rpl/r/rpl_gtid_strict.result
 share/mysql-test/suite/rpl/r/rpl_gtid_until.result
+share/mysql-test/suite/rpl/r/rpl_gtid_until_before_after_gtids.result
 share/mysql-test/suite/rpl/r/rpl_heartbeat.result
 share/mysql-test/suite/rpl/r/rpl_heartbeat_2slaves.result
 share/mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
@@ -13379,7 +14143,6 @@ share/mysql-test/suite/rpl/r/rpl_init_slave.result
 share/mysql-test/suite/rpl/r/rpl_init_slave_errors.result
 share/mysql-test/suite/rpl/r/rpl_innodb_bug28430.result
 share/mysql-test/suite/rpl/r/rpl_innodb_bug30888.result
-share/mysql-test/suite/rpl/r/rpl_innodb_bug68220.result
 share/mysql-test/suite/rpl/r/rpl_innodb_mixed_ddl.result
 share/mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result
 share/mysql-test/suite/rpl/r/rpl_insert.result
@@ -13419,12 +14182,14 @@ share/mysql-test/suite/rpl/r/rpl_master_pos_wait.result
 share/mysql-test/suite/rpl/r/rpl_mdev-11092.result
 share/mysql-test/suite/rpl/r/rpl_mdev10863.result
 share/mysql-test/suite/rpl/r/rpl_mdev12179.result
+share/mysql-test/suite/rpl/r/rpl_mdev33798.result
 share/mysql-test/suite/rpl/r/rpl_mdev359.result
 share/mysql-test/suite/rpl/r/rpl_mdev382.result
 share/mysql-test/suite/rpl/r/rpl_mdev6020.result
 share/mysql-test/suite/rpl/r/rpl_mdev6386.result
 share/mysql-test/suite/rpl/r/rpl_mdev8193.result
 share/mysql-test/suite/rpl/r/rpl_mdev_17614.result
+share/mysql-test/suite/rpl/r/rpl_memory_engine_truncate_on_restart.result
 share/mysql-test/suite/rpl/r/rpl_misc_functions.result
 share/mysql-test/suite/rpl/r/rpl_mix_found_rows.result
 share/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
@@ -13446,6 +14211,7 @@ 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_mysqldump_gtid_slave_pos.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
@@ -13462,9 +14228,12 @@ 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.result
 share/mysql-test/suite/rpl/r/rpl_parallel_analyze_table_hang.result
+share/mysql-test/suite/rpl/r/rpl_parallel_autoinc.result
 share/mysql-test/suite/rpl/r/rpl_parallel_charset.result
 share/mysql-test/suite/rpl/r/rpl_parallel_conflicts.result
 share/mysql-test/suite/rpl/r/rpl_parallel_deadlock_corrupt_binlog.result
+share/mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim.result
+share/mysql-test/suite/rpl/r/rpl_parallel_deadlock_victim2.result
 share/mysql-test/suite/rpl/r/rpl_parallel_domain.result
 share/mysql-test/suite/rpl/r/rpl_parallel_domain_slave_single_grp.result
 share/mysql-test/suite/rpl/r/rpl_parallel_free_deferred_event.result
@@ -13479,6 +14248,7 @@ share/mysql-test/suite/rpl/r/rpl_parallel_kill.result
 share/mysql-test/suite/rpl/r/rpl_parallel_mdev6589.result
 share/mysql-test/suite/rpl/r/rpl_parallel_missed_error_handling.result
 share/mysql-test/suite/rpl/r/rpl_parallel_mode.result
+share/mysql-test/suite/rpl/r/rpl_parallel_multi_domain_xa.result
 share/mysql-test/suite/rpl/r/rpl_parallel_multilevel.result
 share/mysql-test/suite/rpl/r/rpl_parallel_multilevel2.result
 share/mysql-test/suite/rpl/r/rpl_parallel_no_log_slave_updates.result
@@ -13537,6 +14307,7 @@ share/mysql-test/suite/rpl/r/rpl_report.result
 share/mysql-test/suite/rpl/r/rpl_report_port.result
 share/mysql-test/suite/rpl/r/rpl_reset_slave_all_clears_filters.result
 share/mysql-test/suite/rpl/r/rpl_reset_slave_fail.result
+share/mysql-test/suite/rpl/r/rpl_rewrite_db_sys_vars.result
 share/mysql-test/suite/rpl/r/rpl_rewrt_db.result
 share/mysql-test/suite/rpl/r/rpl_rotate_logs.result
 share/mysql-test/suite/rpl/r/rpl_rotate_purge_deadlock.result
@@ -13575,9 +14346,12 @@ share/mysql-test/suite/rpl/r/rpl_row_func002.result
 share/mysql-test/suite/rpl/r/rpl_row_func003.result
 share/mysql-test/suite/rpl/r/rpl_row_idempotency.result
 share/mysql-test/suite/rpl/r/rpl_row_img_blobs.result
+share/mysql-test/suite/rpl/r/rpl_row_img_eng_full_nodup.result
 share/mysql-test/suite/rpl/r/rpl_row_img_eng_min.result
 share/mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result
+share/mysql-test/suite/rpl/r/rpl_row_img_full_nodup.result
 share/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.result
+share/mysql-test/suite/rpl/r/rpl_row_img_sequence_full_nodup.result
 share/mysql-test/suite/rpl/r/rpl_row_img_sequence_min.result
 share/mysql-test/suite/rpl/r/rpl_row_img_sequence_noblob.result
 share/mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
@@ -13635,14 +14409,17 @@ share/mysql-test/suite/rpl/r/rpl_seconds_behind_master_spike.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_after_sync_row.result
+share/mysql-test/suite/rpl/r/rpl_semi_sync_cond_var_per_thd.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_event.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_event_after_sync.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_fail_over.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_gtid_reconnect.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_master_shutdown.result
+share/mysql-test/suite/rpl/r/rpl_semi_sync_no_missed_ack_after_add_slave.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_shutdown_await_ack.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_skip_repl.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_slave_compressed_protocol.result
+share/mysql-test/suite/rpl/r/rpl_semi_sync_slave_enabled_consistent.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_slave_reply_fail.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_wait_no_slave.result
 share/mysql-test/suite/rpl/r/rpl_semi_sync_wait_point.result
@@ -13651,6 +14428,7 @@ share/mysql-test/suite/rpl/r/rpl_server_id1.result
 share/mysql-test/suite/rpl/r/rpl_server_id2.result
 share/mysql-test/suite/rpl/r/rpl_server_id_ignore.result
 share/mysql-test/suite/rpl/r/rpl_session_var.result
+share/mysql-test/suite/rpl/r/rpl_session_var2.result
 share/mysql-test/suite/rpl/r/rpl_set_charset.result
 share/mysql-test/suite/rpl/r/rpl_set_null_innodb.result
 share/mysql-test/suite/rpl/r/rpl_set_null_myisam.result
@@ -13658,6 +14436,8 @@ share/mysql-test/suite/rpl/r/rpl_set_statement.result
 share/mysql-test/suite/rpl/r/rpl_set_statement_default_master.result
 share/mysql-test/suite/rpl/r/rpl_show_slave_hosts.result
 share/mysql-test/suite/rpl/r/rpl_show_slave_running.result
+share/mysql-test/suite/rpl/r/rpl_show_slave_status.result
+share/mysql-test/suite/rpl/r/rpl_shutdown_sighup.result
 share/mysql-test/suite/rpl/r/rpl_shutdown_wait_semisync_slaves.result
 share/mysql-test/suite/rpl/r/rpl_shutdown_wait_slaves.result
 share/mysql-test/suite/rpl/r/rpl_skip_error.result
@@ -13669,6 +14449,8 @@ share/mysql-test/suite/rpl/r/rpl_slave_invalid_external_user.result
 share/mysql-test/suite/rpl/r/rpl_slave_load_in.result
 share/mysql-test/suite/rpl/r/rpl_slave_load_remove_tmpfile.result
 share/mysql-test/suite/rpl/r/rpl_slave_load_tmpdir_not_exist.result
+share/mysql-test/suite/rpl/r/rpl_slave_max_statement_time.result
+share/mysql-test/suite/rpl/r/rpl_slave_restart_long_password.result
 share/mysql-test/suite/rpl/r/rpl_slave_shutdown_mdev20821.result
 share/mysql-test/suite/rpl/r/rpl_slave_skip.result
 share/mysql-test/suite/rpl/r/rpl_slave_status.result
@@ -13680,6 +14462,7 @@ share/mysql-test/suite/rpl/r/rpl_sp_variables.result
 share/mysql-test/suite/rpl/r/rpl_spec_variables.result
 share/mysql-test/suite/rpl/r/rpl_special_charset.result
 share/mysql-test/suite/rpl/r/rpl_sporadic_master.result
+share/mysql-test/suite/rpl/r/rpl_sql_thd_start_errno_cleared.result
 share/mysql-test/suite/rpl/r/rpl_ssl.result
 share/mysql-test/suite/rpl/r/rpl_ssl1.result
 share/mysql-test/suite/rpl/r/rpl_start_alter_1.result
@@ -13750,6 +14533,7 @@ share/mysql-test/suite/rpl/r/rpl_temporal_mysql56_to_mariadb53.result
 share/mysql-test/suite/rpl/r/rpl_temporal_round.result
 share/mysql-test/suite/rpl/r/rpl_temporary.result
 share/mysql-test/suite/rpl/r/rpl_temporary_error2.result
+share/mysql-test/suite/rpl/r/rpl_temporary_error2_skip_all.result
 share/mysql-test/suite/rpl/r/rpl_temporary_errors.result
 share/mysql-test/suite/rpl/r/rpl_test_framework.result
 share/mysql-test/suite/rpl/r/rpl_timestamp.result
@@ -13769,6 +14553,7 @@ share/mysql-test/suite/rpl/r/rpl_update.result
 share/mysql-test/suite/rpl/r/rpl_upgrade_master_info.result
 share/mysql-test/suite/rpl/r/rpl_user.result
 share/mysql-test/suite/rpl/r/rpl_user_variables.result
+share/mysql-test/suite/rpl/r/rpl_using_gtid_default.result
 share/mysql-test/suite/rpl/r/rpl_variables.result
 share/mysql-test/suite/rpl/r/rpl_variables_stm.result
 share/mysql-test/suite/rpl/r/rpl_view.result
@@ -13810,6 +14595,8 @@ share/mysql-test/suite/rpl/t/kill_hard-6290.test
 share/mysql-test/suite/rpl/t/kill_race_condition.test
 share/mysql-test/suite/rpl/t/last_insert_id.cnf
 share/mysql-test/suite/rpl/t/last_insert_id.test
+share/mysql-test/suite/rpl/t/max_binlog_total_size-master.opt
+share/mysql-test/suite/rpl/t/max_binlog_total_size.test
 share/mysql-test/suite/rpl/t/mdev-31448_kill_ooo_finish_optimistic.test
 share/mysql-test/suite/rpl/t/mdev_17588-slave.opt
 share/mysql-test/suite/rpl/t/mdev_17588.test
@@ -13825,6 +14612,7 @@ share/mysql-test/suite/rpl/t/parallel_backup_slave_binlog_off-slave.opt
 share/mysql-test/suite/rpl/t/parallel_backup_slave_binlog_off.test
 share/mysql-test/suite/rpl/t/parallel_backup_xa.inc
 share/mysql-test/suite/rpl/t/password_expiration.test
+share/mysql-test/suite/rpl/t/purge_binlog.test
 share/mysql-test/suite/rpl/t/rename.test
 share/mysql-test/suite/rpl/t/replace.test
 share/mysql-test/suite/rpl/t/rpl_000010-slave.opt
@@ -13841,8 +14629,10 @@ share/mysql-test/suite/rpl/t/rpl_LD_INFILE.test
 share/mysql-test/suite/rpl/t/rpl_alter.test
 share/mysql-test/suite/rpl/t/rpl_alter_db.test
 share/mysql-test/suite/rpl/t/rpl_alter_extra_persistent.test
-share/mysql-test/suite/rpl/t/rpl_alter_instant.test
+share/mysql-test/suite/rpl/t/rpl_alter_innodb.test
+share/mysql-test/suite/rpl/t/rpl_alter_online_debug.test
 share/mysql-test/suite/rpl/t/rpl_alter_rollback.test
+share/mysql-test/suite/rpl/t/rpl_auditing.test
 share/mysql-test/suite/rpl/t/rpl_auto_increment-master.opt
 share/mysql-test/suite/rpl/t/rpl_auto_increment-slave.opt
 share/mysql-test/suite/rpl/t/rpl_auto_increment.test
@@ -13854,6 +14644,8 @@ share/mysql-test/suite/rpl/t/rpl_autogen_query_multi_byte_char.test
 share/mysql-test/suite/rpl/t/rpl_begin_commit_rollback-master.opt
 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_cache_disk_full_loaddata.test
+share/mysql-test/suite/rpl/t/rpl_binlog_cache_disk_full_row.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
@@ -13878,6 +14670,7 @@ share/mysql-test/suite/rpl/t/rpl_bug38694.test
 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
+share/mysql-test/suite/rpl/t/rpl_change_master_demote.test
 share/mysql-test/suite/rpl/t/rpl_change_master_find_log_pos_err.test
 share/mysql-test/suite/rpl/t/rpl_charset.test
 share/mysql-test/suite/rpl/t/rpl_charset_sjis.test
@@ -13915,8 +14708,7 @@ share/mysql-test/suite/rpl/t/rpl_create_or_replace_fail.test
 share/mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test
 share/mysql-test/suite/rpl/t/rpl_create_xa_prepared.inc
 share/mysql-test/suite/rpl/t/rpl_critical_errors.test
-share/mysql-test/suite/rpl/t/rpl_cross_version-master.opt
-share/mysql-test/suite/rpl/t/rpl_cross_version.test
+share/mysql-test/suite/rpl/t/rpl_ctype_collate_implicit.test
 share/mysql-test/suite/rpl/t/rpl_ctype_latin1.test
 share/mysql-test/suite/rpl/t/rpl_current_user.cnf
 share/mysql-test/suite/rpl/t/rpl_current_user.test
@@ -13924,6 +14716,7 @@ share/mysql-test/suite/rpl/t/rpl_ddl-slave.opt
 share/mysql-test/suite/rpl/t/rpl_ddl.test
 share/mysql-test/suite/rpl/t/rpl_deadlock_innodb-slave.opt
 share/mysql-test/suite/rpl/t/rpl_deadlock_innodb.test
+share/mysql-test/suite/rpl/t/rpl_deadlock_show_slave_status.test
 share/mysql-test/suite/rpl/t/rpl_default.test
 share/mysql-test/suite/rpl/t/rpl_delayed_slave.combinations
 share/mysql-test/suite/rpl/t/rpl_delayed_slave.test
@@ -13952,6 +14745,7 @@ share/mysql-test/suite/rpl/t/rpl_events.test
 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_minimal.test
 share/mysql-test/suite/rpl/t/rpl_extra_col_slave_myisam.test
 share/mysql-test/suite/rpl/t/rpl_fail_register.test
 share/mysql-test/suite/rpl/t/rpl_failed_drop_tbl_binlog.opt
@@ -13976,6 +14770,7 @@ share/mysql-test/suite/rpl/t/rpl_geometry.test
 share/mysql-test/suite/rpl/t/rpl_get_lock.test
 share/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock-slave.opt
 share/mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
+share/mysql-test/suite/rpl/t/rpl_gis_user_var.test
 share/mysql-test/suite/rpl/t/rpl_grant.test
 share/mysql-test/suite/rpl/t/rpl_gtid_basic.cnf
 share/mysql-test/suite/rpl/t/rpl_gtid_basic.test
@@ -13990,7 +14785,9 @@ share/mysql-test/suite/rpl/t/rpl_gtid_errorlog.test
 share/mysql-test/suite/rpl/t/rpl_gtid_excess_initial_delay.test
 share/mysql-test/suite/rpl/t/rpl_gtid_glle_no_terminate.test
 share/mysql-test/suite/rpl/t/rpl_gtid_grouping.test
+share/mysql-test/suite/rpl/t/rpl_gtid_header_valid.test
 share/mysql-test/suite/rpl/t/rpl_gtid_ignored.test
+share/mysql-test/suite/rpl/t/rpl_gtid_index.test
 share/mysql-test/suite/rpl/t/rpl_gtid_master_promote.cnf
 share/mysql-test/suite/rpl/t/rpl_gtid_master_promote.test
 share/mysql-test/suite/rpl/t/rpl_gtid_mdev4473.cnf
@@ -14007,12 +14804,15 @@ share/mysql-test/suite/rpl/t/rpl_gtid_misc.test
 share/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.cnf
 share/mysql-test/suite/rpl/t/rpl_gtid_nobinlog.test
 share/mysql-test/suite/rpl/t/rpl_gtid_reconnect.test
+share/mysql-test/suite/rpl/t/rpl_gtid_slave_filtering.cnf
+share/mysql-test/suite/rpl/t/rpl_gtid_slave_filtering.test
 share/mysql-test/suite/rpl/t/rpl_gtid_sort.test
 share/mysql-test/suite/rpl/t/rpl_gtid_startpos.test
 share/mysql-test/suite/rpl/t/rpl_gtid_stop_start.cnf
 share/mysql-test/suite/rpl/t/rpl_gtid_stop_start.test
 share/mysql-test/suite/rpl/t/rpl_gtid_strict.test
 share/mysql-test/suite/rpl/t/rpl_gtid_until.test
+share/mysql-test/suite/rpl/t/rpl_gtid_until_before_after_gtids.test
 share/mysql-test/suite/rpl/t/rpl_heartbeat.test
 share/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.cnf
 share/mysql-test/suite/rpl/t/rpl_heartbeat_2slaves.test
@@ -14042,7 +14842,6 @@ share/mysql-test/suite/rpl/t/rpl_innodb_bug28430-slave.opt
 share/mysql-test/suite/rpl/t/rpl_innodb_bug28430.test
 share/mysql-test/suite/rpl/t/rpl_innodb_bug30888.opt
 share/mysql-test/suite/rpl/t/rpl_innodb_bug30888.test
-share/mysql-test/suite/rpl/t/rpl_innodb_bug68220.test
 share/mysql-test/suite/rpl/t/rpl_innodb_mixed_ddl.test
 share/mysql-test/suite/rpl/t/rpl_innodb_mixed_dml.test
 share/mysql-test/suite/rpl/t/rpl_insert.test
@@ -14098,6 +14897,8 @@ share/mysql-test/suite/rpl/t/rpl_mdev-11092.opt
 share/mysql-test/suite/rpl/t/rpl_mdev-11092.test
 share/mysql-test/suite/rpl/t/rpl_mdev10863.test
 share/mysql-test/suite/rpl/t/rpl_mdev12179.test
+share/mysql-test/suite/rpl/t/rpl_mdev33798.cnf
+share/mysql-test/suite/rpl/t/rpl_mdev33798.test
 share/mysql-test/suite/rpl/t/rpl_mdev359.test
 share/mysql-test/suite/rpl/t/rpl_mdev382.test
 share/mysql-test/suite/rpl/t/rpl_mdev6020.test
@@ -14105,6 +14906,7 @@ share/mysql-test/suite/rpl/t/rpl_mdev6386-slave.opt
 share/mysql-test/suite/rpl/t/rpl_mdev6386.test
 share/mysql-test/suite/rpl/t/rpl_mdev8193.test
 share/mysql-test/suite/rpl/t/rpl_mdev_17614.test
+share/mysql-test/suite/rpl/t/rpl_memory_engine_truncate_on_restart.test
 share/mysql-test/suite/rpl/t/rpl_misc_functions-slave.sh
 share/mysql-test/suite/rpl/t/rpl_misc_functions.test
 share/mysql-test/suite/rpl/t/rpl_mix_found_rows.test
@@ -14132,6 +14934,7 @@ 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_mysqldump_gtid_slave_pos.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
@@ -14151,9 +14954,12 @@ 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.test
 share/mysql-test/suite/rpl/t/rpl_parallel_analyze_table_hang.test
+share/mysql-test/suite/rpl/t/rpl_parallel_autoinc.test
 share/mysql-test/suite/rpl/t/rpl_parallel_charset.test
 share/mysql-test/suite/rpl/t/rpl_parallel_conflicts.test
 share/mysql-test/suite/rpl/t/rpl_parallel_deadlock_corrupt_binlog.test
+share/mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim.test
+share/mysql-test/suite/rpl/t/rpl_parallel_deadlock_victim2.test
 share/mysql-test/suite/rpl/t/rpl_parallel_domain.test
 share/mysql-test/suite/rpl/t/rpl_parallel_domain_slave_single_grp.test
 share/mysql-test/suite/rpl/t/rpl_parallel_free_deferred_event.test
@@ -14168,6 +14974,7 @@ share/mysql-test/suite/rpl/t/rpl_parallel_kill.test
 share/mysql-test/suite/rpl/t/rpl_parallel_mdev6589.test
 share/mysql-test/suite/rpl/t/rpl_parallel_missed_error_handling.test
 share/mysql-test/suite/rpl/t/rpl_parallel_mode.test
+share/mysql-test/suite/rpl/t/rpl_parallel_multi_domain_xa.test
 share/mysql-test/suite/rpl/t/rpl_parallel_multilevel.cnf
 share/mysql-test/suite/rpl/t/rpl_parallel_multilevel.test
 share/mysql-test/suite/rpl/t/rpl_parallel_multilevel2.cnf
@@ -14240,6 +15047,8 @@ share/mysql-test/suite/rpl/t/rpl_report.test
 share/mysql-test/suite/rpl/t/rpl_report_port.test
 share/mysql-test/suite/rpl/t/rpl_reset_slave_all_clears_filters.test
 share/mysql-test/suite/rpl/t/rpl_reset_slave_fail.test
+share/mysql-test/suite/rpl/t/rpl_rewrite_db_sys_vars-slave.opt
+share/mysql-test/suite/rpl/t/rpl_rewrite_db_sys_vars.test
 share/mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt
 share/mysql-test/suite/rpl/t/rpl_rewrt_db.test
 share/mysql-test/suite/rpl/t/rpl_rotate_logs.cnf
@@ -14290,12 +15099,18 @@ share/mysql-test/suite/rpl/t/rpl_row_idempotency.test
 share/mysql-test/suite/rpl/t/rpl_row_img.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_blobs.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_blobs.test
+share/mysql-test/suite/rpl/t/rpl_row_img_eng_full_nodup.cnf
+share/mysql-test/suite/rpl/t/rpl_row_img_eng_full_nodup.test
 share/mysql-test/suite/rpl/t/rpl_row_img_eng_min.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_eng_min.test
 share/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_eng_noblob.test
+share/mysql-test/suite/rpl/t/rpl_row_img_full_nodup.cnf
+share/mysql-test/suite/rpl/t/rpl_row_img_full_nodup.test
 share/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_sequence_full.test
+share/mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.cnf
+share/mysql-test/suite/rpl/t/rpl_row_img_sequence_full_nodup.test
 share/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.cnf
 share/mysql-test/suite/rpl/t/rpl_row_img_sequence_min.test
 share/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.cnf
@@ -14360,6 +15175,8 @@ share/mysql-test/suite/rpl/t/rpl_seconds_behind_master_spike.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_after_sync_row.test
+share/mysql-test/suite/rpl/t/rpl_semi_sync_cond_var_per_thd.cnf
+share/mysql-test/suite/rpl/t/rpl_semi_sync_cond_var_per_thd.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_crash.inc
 share/mysql-test/suite/rpl/t/rpl_semi_sync_event-master.opt
 share/mysql-test/suite/rpl/t/rpl_semi_sync_event.test
@@ -14369,12 +15186,15 @@ share/mysql-test/suite/rpl/t/rpl_semi_sync_fail_over.cnf
 share/mysql-test/suite/rpl/t/rpl_semi_sync_fail_over.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_gtid_reconnect.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_master_shutdown.test
+share/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.cnf
+share/mysql-test/suite/rpl/t/rpl_semi_sync_no_missed_ack_after_add_slave.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.cnf
 share/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.inc
 share/mysql-test/suite/rpl/t/rpl_semi_sync_shutdown_await_ack.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_skip_repl.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol-slave.opt
 share/mysql-test/suite/rpl/t/rpl_semi_sync_slave_compressed_protocol.test
+share/mysql-test/suite/rpl/t/rpl_semi_sync_slave_enabled_consistent.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_slave_reply_fail.test
 share/mysql-test/suite/rpl/t/rpl_semi_sync_wait_no_slave-master.opt
 share/mysql-test/suite/rpl/t/rpl_semi_sync_wait_no_slave.test
@@ -14389,6 +15209,9 @@ share/mysql-test/suite/rpl/t/rpl_server_id2.test
 share/mysql-test/suite/rpl/t/rpl_server_id_ignore-slave.opt
 share/mysql-test/suite/rpl/t/rpl_server_id_ignore.test
 share/mysql-test/suite/rpl/t/rpl_session_var.test
+share/mysql-test/suite/rpl/t/rpl_session_var2-master.opt
+share/mysql-test/suite/rpl/t/rpl_session_var2-slave.opt
+share/mysql-test/suite/rpl/t/rpl_session_var2.test
 share/mysql-test/suite/rpl/t/rpl_set_charset.test
 share/mysql-test/suite/rpl/t/rpl_set_null_innodb.test
 share/mysql-test/suite/rpl/t/rpl_set_null_myisam.test
@@ -14397,6 +15220,8 @@ share/mysql-test/suite/rpl/t/rpl_set_statement_default_master.test
 share/mysql-test/suite/rpl/t/rpl_show_slave_hosts.cnf
 share/mysql-test/suite/rpl/t/rpl_show_slave_hosts.test
 share/mysql-test/suite/rpl/t/rpl_show_slave_running.test
+share/mysql-test/suite/rpl/t/rpl_show_slave_status.test
+share/mysql-test/suite/rpl/t/rpl_shutdown_sighup.test
 share/mysql-test/suite/rpl/t/rpl_shutdown_wait_semisync_slaves.cnf
 share/mysql-test/suite/rpl/t/rpl_shutdown_wait_semisync_slaves.test
 share/mysql-test/suite/rpl/t/rpl_shutdown_wait_slaves.cnf
@@ -14414,6 +15239,8 @@ share/mysql-test/suite/rpl/t/rpl_slave_load_in.test
 share/mysql-test/suite/rpl/t/rpl_slave_load_remove_tmpfile.test
 share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist-slave.opt
 share/mysql-test/suite/rpl/t/rpl_slave_load_tmpdir_not_exist.test
+share/mysql-test/suite/rpl/t/rpl_slave_max_statement_time.test
+share/mysql-test/suite/rpl/t/rpl_slave_restart_long_password.test
 share/mysql-test/suite/rpl/t/rpl_slave_shutdown_mdev20821.cnf
 share/mysql-test/suite/rpl/t/rpl_slave_shutdown_mdev20821.test
 share/mysql-test/suite/rpl/t/rpl_slave_skip.test
@@ -14433,6 +15260,7 @@ share/mysql-test/suite/rpl/t/rpl_special_charset.opt
 share/mysql-test/suite/rpl/t/rpl_special_charset.test
 share/mysql-test/suite/rpl/t/rpl_sporadic_master-master.opt
 share/mysql-test/suite/rpl/t/rpl_sporadic_master.test
+share/mysql-test/suite/rpl/t/rpl_sql_thd_start_errno_cleared.test
 share/mysql-test/suite/rpl/t/rpl_ssl.test
 share/mysql-test/suite/rpl/t/rpl_ssl1.test
 share/mysql-test/suite/rpl/t/rpl_start_alter_1.test
@@ -14515,6 +15343,8 @@ share/mysql-test/suite/rpl/t/rpl_temporal_mysql56_to_mariadb53.test
 share/mysql-test/suite/rpl/t/rpl_temporal_round.test
 share/mysql-test/suite/rpl/t/rpl_temporary.test
 share/mysql-test/suite/rpl/t/rpl_temporary_error2.test
+share/mysql-test/suite/rpl/t/rpl_temporary_error2_skip_all-slave.opt
+share/mysql-test/suite/rpl/t/rpl_temporary_error2_skip_all.test
 share/mysql-test/suite/rpl/t/rpl_temporary_errors-slave.opt
 share/mysql-test/suite/rpl/t/rpl_temporary_errors.test
 share/mysql-test/suite/rpl/t/rpl_test_framework.cnf
@@ -14539,6 +15369,7 @@ share/mysql-test/suite/rpl/t/rpl_update.test
 share/mysql-test/suite/rpl/t/rpl_upgrade_master_info.test
 share/mysql-test/suite/rpl/t/rpl_user.test
 share/mysql-test/suite/rpl/t/rpl_user_variables.test
+share/mysql-test/suite/rpl/t/rpl_using_gtid_default.test
 share/mysql-test/suite/rpl/t/rpl_variables.test
 share/mysql-test/suite/rpl/t/rpl_variables_stm.test
 share/mysql-test/suite/rpl/t/rpl_view.test
@@ -14581,6 +15412,8 @@ share/mysql-test/suite/s3/backup.test
 share/mysql-test/suite/s3/basic.result
 share/mysql-test/suite/s3/basic.test
 share/mysql-test/suite/s3/create_database.inc
+share/mysql-test/suite/s3/debug.result
+share/mysql-test/suite/s3/debug.test
 share/mysql-test/suite/s3/disabled.def
 share/mysql-test/suite/s3/discovery.result
 share/mysql-test/suite/s3/discovery.test
@@ -15020,6 +15853,7 @@ 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/
 share/mysql-test/suite/sys_vars/r/all_vars.result
+share/mysql-test/suite/sys_vars/r/allow_suspicious_udfs.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
@@ -15039,7 +15873,6 @@ share/mysql-test/suite/sys_vars/r/aria_pagecache_division_limit_basic.result
 share/mysql-test/suite/sys_vars/r/aria_pagecache_file_hash_size_basic.result
 share/mysql-test/suite/sys_vars/r/aria_recover_options_basic.result
 share/mysql-test/suite/sys_vars/r/aria_repair_threads_basic.result
-share/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic,32bit.rdiff
 share/mysql-test/suite/sys_vars/r/aria_sort_buffer_size_basic.result
 share/mysql-test/suite/sys_vars/r/aria_stats_method_basic.result
 share/mysql-test/suite/sys_vars/r/aria_sync_log_dir_basic.result
@@ -15111,19 +15944,16 @@ share/mysql-test/suite/sys_vars/r/concurrent_insert_func.result
 share/mysql-test/suite/sys_vars/r/connect_timeout_basic.result
 share/mysql-test/suite/sys_vars/r/connect_timeout_grant.result
 share/mysql-test/suite/sys_vars/r/datadir_basic.result
-share/mysql-test/suite/sys_vars/r/date_format_basic.result
-share/mysql-test/suite/sys_vars/r/datetime_format_basic.result
 share/mysql-test/suite/sys_vars/r/deadlock_search_depth_long_basic.result
 share/mysql-test/suite/sys_vars/r/deadlock_search_depth_short_basic.result
 share/mysql-test/suite/sys_vars/r/deadlock_timeout_long_basic.result
 share/mysql-test/suite/sys_vars/r/deadlock_timeout_short_basic.result
-share/mysql-test/suite/sys_vars/r/debug_basic.result
 share/mysql-test/suite/sys_vars/r/debug_binlog_fsync_sleep_basic.result
 share/mysql-test/suite/sys_vars/r/debug_dbug_basic.result
 share/mysql-test/suite/sys_vars/r/debug_dbug_func.result
 share/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
+share/mysql-test/suite/sys_vars/r/debug_dbug_utf16le.result
 share/mysql-test/suite/sys_vars/r/debug_mutex_deadlock_detector_basic.result
-share/mysql-test/suite/sys_vars/r/debug_no_thread_alarm_basic.result
 share/mysql-test/suite/sys_vars/r/debug_sync_basic.result
 share/mysql-test/suite/sys_vars/r/default_master_connection_basic.result
 share/mysql-test/suite/sys_vars/r/default_regex_flags_basic.result
@@ -15188,10 +16018,8 @@ share/mysql-test/suite/sys_vars/r/gtid_strict_mode_basic.result
 share/mysql-test/suite/sys_vars/r/gtid_strict_mode_grant.result
 share/mysql-test/suite/sys_vars/r/have_compress_basic.result
 share/mysql-test/suite/sys_vars/r/have_crypt_basic.result
-share/mysql-test/suite/sys_vars/r/have_csv_basic.result
 share/mysql-test/suite/sys_vars/r/have_dynamic_loading_basic.result
 share/mysql-test/suite/sys_vars/r/have_geometry_basic.result
-share/mysql-test/suite/sys_vars/r/have_innodb_basic.result
 share/mysql-test/suite/sys_vars/r/have_openssl_basic.result
 share/mysql-test/suite/sys_vars/r/have_profiling_basic.result
 share/mysql-test/suite/sys_vars/r/have_query_cache_basic.result
@@ -15233,9 +16061,6 @@ share/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_abort_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_at_startup_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_buffer_pool_load_now_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_buffer_pool_size_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_change_buffer_max_size_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_change_buffering_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_change_buffering_debug_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_checksum_algorithm_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_cmp_per_index_enabled_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_compression_algorithm_basic.result
@@ -15246,12 +16071,6 @@ share/mysql-test/suite/sys_vars/r/innodb_data_file_path_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_data_home_dir_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_deadlock_detect_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_default_row_format_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_fill_factor_n_recs_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_frequency_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_n_pages_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_defragment_stats_accuracy_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_disable_sort_file_cache_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_doublewrite_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_encrypt_log_basic.result
@@ -15315,7 +16134,6 @@ share/mysql-test/suite/sys_vars/r/innodb_online_alter_log_max_size_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_open_files_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_optimize_fulltext_only_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_page_size_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_prefix_index_cluster_optimization_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_print_all_deadlocks_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_purge_batch_size_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_purge_rseg_truncate_frequency_basic.result
@@ -15352,7 +16170,6 @@ share/mysql-test/suite/sys_vars/r/innodb_undo_log_truncate_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_undo_tablespaces_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_use_atomic_writes_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_use_native_aio_basic.result
-share/mysql-test/suite/sys_vars/r/innodb_version_basic.result
 share/mysql-test/suite/sys_vars/r/innodb_write_io_threads_basic.result
 share/mysql-test/suite/sys_vars/r/insert_id_basic.result
 share/mysql-test/suite/sys_vars/r/insert_id_func.result
@@ -15404,11 +16221,7 @@ share/mysql-test/suite/sys_vars/r/log_queries_not_using_indexes_basic.result
 share/mysql-test/suite/sys_vars/r/log_result_errors_basic.result
 share/mysql-test/suite/sys_vars/r/log_slave_updates_basic.result
 share/mysql-test/suite/sys_vars/r/log_slow_admin_statements_func.result
-share/mysql-test/suite/sys_vars/r/log_slow_disabled_statements_basic.result
 share/mysql-test/suite/sys_vars/r/log_slow_disabled_statements_func.result
-share/mysql-test/suite/sys_vars/r/log_slow_filter_basic.result
-share/mysql-test/suite/sys_vars/r/log_slow_queries_basic.result
-share/mysql-test/suite/sys_vars/r/log_slow_rate_limit_basic.result
 share/mysql-test/suite/sys_vars/r/log_slow_verbosity_basic.result
 share/mysql-test/suite/sys_vars/r/log_tc_size_basic.result
 share/mysql-test/suite/sys_vars/r/log_warnings_basic.result
@@ -15427,6 +16240,7 @@ share/mysql-test/suite/sys_vars/r/max_binlog_size_basic.result
 share/mysql-test/suite/sys_vars/r/max_binlog_size_grant.result
 share/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_basic.result
 share/mysql-test/suite/sys_vars/r/max_binlog_stmt_cache_size_grant.result
+share/mysql-test/suite/sys_vars/r/max_binlog_total_size_basic.result
 share/mysql-test/suite/sys_vars/r/max_connect_errors_basic.result
 share/mysql-test/suite/sys_vars/r/max_connect_errors_grant.result
 share/mysql-test/suite/sys_vars/r/max_connections_basic.result
@@ -15435,7 +16249,6 @@ share/mysql-test/suite/sys_vars/r/max_delayed_threads_basic.result
 share/mysql-test/suite/sys_vars/r/max_digest_length_basic.result
 share/mysql-test/suite/sys_vars/r/max_error_count_basic.result
 share/mysql-test/suite/sys_vars/r/max_heap_table_size_basic.result
-share/mysql-test/suite/sys_vars/r/max_insert_delayed_threads_basic.result
 share/mysql-test/suite/sys_vars/r/max_join_size_basic.result
 share/mysql-test/suite/sys_vars/r/max_join_size_func.result
 share/mysql-test/suite/sys_vars/r/max_length_for_sort_data_basic.result
@@ -15449,12 +16262,15 @@ 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
 share/mysql-test/suite/sys_vars/r/max_statement_time_basic.result
-share/mysql-test/suite/sys_vars/r/max_tmp_tables_basic.result
 share/mysql-test/suite/sys_vars/r/max_user_connections-2.result
 share/mysql-test/suite/sys_vars/r/max_user_connections_basic.result
 share/mysql-test/suite/sys_vars/r/max_user_connections_func.result
 share/mysql-test/suite/sys_vars/r/max_write_lock_count_basic.result
 share/mysql-test/suite/sys_vars/r/maximum_basic.result
+share/mysql-test/suite/sys_vars/r/mdev_15935.result
+share/mysql-test/suite/sys_vars/r/mdev_32254.result
+share/mysql-test/suite/sys_vars/r/mdev_32525.result
+share/mysql-test/suite/sys_vars/r/mdev_32640.result
 share/mysql-test/suite/sys_vars/r/metadata_locks_cache_size_basic.result
 share/mysql-test/suite/sys_vars/r/metadata_locks_hash_instances_basic.result
 share/mysql-test/suite/sys_vars/r/min_examined_row_limit_basic.result
@@ -15477,7 +16293,6 @@ share/mysql-test/suite/sys_vars/r/net_buffer_length_basic.result
 share/mysql-test/suite/sys_vars/r/net_read_timeout_basic.result
 share/mysql-test/suite/sys_vars/r/net_retry_count_basic.result
 share/mysql-test/suite/sys_vars/r/net_write_timeout_basic.result
-share/mysql-test/suite/sys_vars/r/old_alter_table_basic.result
 share/mysql-test/suite/sys_vars/r/old_basic.result
 share/mysql-test/suite/sys_vars/r/old_mode_basic.result
 share/mysql-test/suite/sys_vars/r/old_passwords_basic.result
@@ -15534,6 +16349,7 @@ share/mysql-test/suite/sys_vars/r/protocol_version_basic.result
 share/mysql-test/suite/sys_vars/r/proxy_protocol_networks_grant.result
 share/mysql-test/suite/sys_vars/r/proxy_user_basic.result
 share/mysql-test/suite/sys_vars/r/pseudo_slave_mode_basic.result
+share/mysql-test/suite/sys_vars/r/pseudo_slave_mode_notembedded.result
 share/mysql-test/suite/sys_vars/r/pseudo_thread_id_basic.result
 share/mysql-test/suite/sys_vars/r/query_alloc_block_size_basic.result
 share/mysql-test/suite/sys_vars/r/query_cache_limit_basic.result
@@ -15556,6 +16372,7 @@ share/mysql-test/suite/sys_vars/r/read_only_basic.result
 share/mysql-test/suite/sys_vars/r/read_only_func.result
 share/mysql-test/suite/sys_vars/r/read_only_grant.result
 share/mysql-test/suite/sys_vars/r/read_rnd_buffer_size_basic.result
+share/mysql-test/suite/sys_vars/r/redirect.result
 share/mysql-test/suite/sys_vars/r/relay_log_basename_basic.result
 share/mysql-test/suite/sys_vars/r/relay_log_basic.result
 share/mysql-test/suite/sys_vars/r/relay_log_index_basic.result
@@ -15576,6 +16393,7 @@ share/mysql-test/suite/sys_vars/r/replicate_ignore_db_basic.result
 share/mysql-test/suite/sys_vars/r/replicate_ignore_db_grant.result
 share/mysql-test/suite/sys_vars/r/replicate_ignore_table_basic.result
 share/mysql-test/suite/sys_vars/r/replicate_ignore_table_grant.result
+share/mysql-test/suite/sys_vars/r/replicate_rewrite_db.result
 share/mysql-test/suite/sys_vars/r/replicate_wild_do_table_basic.result
 share/mysql-test/suite/sys_vars/r/replicate_wild_do_table_grant.result
 share/mysql-test/suite/sys_vars/r/replicate_wild_ignore_table_basic.result
@@ -15654,11 +16472,8 @@ share/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_basic.result
 share/mysql-test/suite/sys_vars/r/slave_transaction_retry_interval_grant.result
 share/mysql-test/suite/sys_vars/r/slave_type_conversions_basic.result
 share/mysql-test/suite/sys_vars/r/slave_type_conversions_grant.result
-share/mysql-test/suite/sys_vars/r/slow_launch_time_basic.result
 share/mysql-test/suite/sys_vars/r/slow_launch_time_func.result
 share/mysql-test/suite/sys_vars/r/slow_launch_time_grant.result
-share/mysql-test/suite/sys_vars/r/slow_query_log_basic.result
-share/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
 share/mysql-test/suite/sys_vars/r/slow_query_log_file_func.result
 share/mysql-test/suite/sys_vars/r/slow_query_log_func.result
 share/mysql-test/suite/sys_vars/r/socket_basic.result
@@ -15678,7 +16493,6 @@ share/mysql-test/suite/sys_vars/r/sql_max_join_size_basic.result
 share/mysql-test/suite/sys_vars/r/sql_max_join_size_func.result
 share/mysql-test/suite/sys_vars/r/sql_mode_basic.result
 share/mysql-test/suite/sys_vars/r/sql_mode_func.result
-share/mysql-test/suite/sys_vars/r/sql_notes_basic.result
 share/mysql-test/suite/sys_vars/r/sql_notes_func.result
 share/mysql-test/suite/sys_vars/r/sql_quote_show_create_basic.result
 share/mysql-test/suite/sys_vars/r/sql_quote_show_create_func.result
@@ -15720,6 +16534,7 @@ share/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
 share/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
 share/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
 share/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff
+share/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,win.rdiff
 share/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
 share/mysql-test/suite/sys_vars/r/sysvars_star.result
 share/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
@@ -15743,7 +16558,6 @@ share/mysql-test/suite/sys_vars/r/thread_pool_size_high.result
 share/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_basic.result
 share/mysql-test/suite/sys_vars/r/thread_pool_stall_limit_grant.result
 share/mysql-test/suite/sys_vars/r/thread_stack_basic.result
-share/mysql-test/suite/sys_vars/r/time_format_basic.result
 share/mysql-test/suite/sys_vars/r/time_zone_basic.result
 share/mysql-test/suite/sys_vars/r/time_zone_func.result
 share/mysql-test/suite/sys_vars/r/timestamp_basic.result
@@ -15753,11 +16567,12 @@ share/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
 share/mysql-test/suite/sys_vars/r/tmp_disk_table_size_func.result
 share/mysql-test/suite/sys_vars/r/tmpdir_basic.result
 share/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
+share/mysql-test/suite/sys_vars/r/transaction_isolation_basic.result
+share/mysql-test/suite/sys_vars/r/transaction_isolation_func.result
 share/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
 share/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
-share/mysql-test/suite/sys_vars/r/tx_isolation_basic.result
-share/mysql-test/suite/sys_vars/r/tx_isolation_func.result
-share/mysql-test/suite/sys_vars/r/tx_read_only_basic.result
+share/mysql-test/suite/sys_vars/r/transaction_read_only_basic.result
+share/mysql-test/suite/sys_vars/r/tx_compatibility.result
 share/mysql-test/suite/sys_vars/r/unique_checks_basic.result
 share/mysql-test/suite/sys_vars/r/updatable_views_with_limit_basic.result
 share/mysql-test/suite/sys_vars/r/updatable_views_with_limit_func.result
@@ -15774,7 +16589,6 @@ share/mysql-test/suite/sys_vars/r/wait_timeout_basic.result
 share/mysql-test/suite/sys_vars/r/wait_timeout_func.result
 share/mysql-test/suite/sys_vars/r/warning_count_basic.result
 share/mysql-test/suite/sys_vars/r/wsrep_auto_increment_control_basic.result
-share/mysql-test/suite/sys_vars/r/wsrep_causal_reads_basic.result
 share/mysql-test/suite/sys_vars/r/wsrep_certify_nonpk_basic.result
 share/mysql-test/suite/sys_vars/r/wsrep_cluster_address_basic.result
 share/mysql-test/suite/sys_vars/r/wsrep_cluster_name_basic.result
@@ -15812,6 +16626,7 @@ share/mysql-test/suite/sys_vars/r/wsrep_sync_wait_basic.result
 share/mysql-test/suite/sys_vars/t/
 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/allow_suspicious_udfs.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
@@ -15908,19 +16723,16 @@ share/mysql-test/suite/sys_vars/t/concurrent_insert_func.test
 share/mysql-test/suite/sys_vars/t/connect_timeout_basic.test
 share/mysql-test/suite/sys_vars/t/connect_timeout_grant.test
 share/mysql-test/suite/sys_vars/t/datadir_basic.test
-share/mysql-test/suite/sys_vars/t/date_format_basic.test
-share/mysql-test/suite/sys_vars/t/datetime_format_basic.test
 share/mysql-test/suite/sys_vars/t/deadlock_search_depth_long_basic.test
 share/mysql-test/suite/sys_vars/t/deadlock_search_depth_short_basic.test
 share/mysql-test/suite/sys_vars/t/deadlock_timeout_long_basic.test
 share/mysql-test/suite/sys_vars/t/deadlock_timeout_short_basic.test
-share/mysql-test/suite/sys_vars/t/debug_basic.test
 share/mysql-test/suite/sys_vars/t/debug_binlog_fsync_sleep_basic.test
 share/mysql-test/suite/sys_vars/t/debug_dbug_basic.test
 share/mysql-test/suite/sys_vars/t/debug_dbug_func.test
 share/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test
+share/mysql-test/suite/sys_vars/t/debug_dbug_utf16le.test
 share/mysql-test/suite/sys_vars/t/debug_mutex_deadlock_detector_basic.test
-share/mysql-test/suite/sys_vars/t/debug_no_thread_alarm_basic.test
 share/mysql-test/suite/sys_vars/t/debug_sync_basic.test
 share/mysql-test/suite/sys_vars/t/default_master_connection_basic.test
 share/mysql-test/suite/sys_vars/t/default_regex_flags_basic.test
@@ -16040,9 +16852,6 @@ share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.opt
 share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_now_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic-master.opt
 share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_change_buffer_max_size_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_change_buffering_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_change_buffering_debug_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_checksum_algorithm_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_cmp_per_index_enabled_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_compression_algorithm_basic-master.opt
@@ -16054,13 +16863,8 @@ share/mysql-test/suite/sys_vars/t/innodb_data_file_path_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_data_home_dir_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_deadlock_detect_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_default_row_format_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_fill_factor_n_recs_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_frequency_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_n_pages_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_defragment_stats_accuracy_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_disable_sort_file_cache_basic.test
+share/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.opt
 share/mysql-test/suite/sys_vars/t/innodb_doublewrite_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_encrypt_log_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_encrypt_tables_basic.test
@@ -16124,7 +16928,6 @@ share/mysql-test/suite/sys_vars/t/innodb_online_alter_log_max_size_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_open_files_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_optimize_fulltext_only_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_page_size_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_prefix_index_cluster_optimization_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_print_all_deadlocks_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_purge_batch_size_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_purge_rseg_truncate_frequency_basic.test
@@ -16162,7 +16965,6 @@ share/mysql-test/suite/sys_vars/t/innodb_undo_log_truncate_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_undo_tablespaces_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_use_atomic_writes_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_use_native_aio_basic.test
-share/mysql-test/suite/sys_vars/t/innodb_version_basic.test
 share/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.opt
 share/mysql-test/suite/sys_vars/t/innodb_write_io_threads_basic.test
 share/mysql-test/suite/sys_vars/t/insert_id_basic.test
@@ -16217,10 +17019,7 @@ share/mysql-test/suite/sys_vars/t/log_output_func.test
 share/mysql-test/suite/sys_vars/t/log_queries_not_using_indexes_basic.test
 share/mysql-test/suite/sys_vars/t/log_slave_updates_basic.test
 share/mysql-test/suite/sys_vars/t/log_slow_admin_statements_func.test
-share/mysql-test/suite/sys_vars/t/log_slow_disabled_statements_basic.test
 share/mysql-test/suite/sys_vars/t/log_slow_disabled_statements_func.test
-share/mysql-test/suite/sys_vars/t/log_slow_filter_basic.test
-share/mysql-test/suite/sys_vars/t/log_slow_rate_limit_basic.test
 share/mysql-test/suite/sys_vars/t/log_slow_verbosity_basic.test
 share/mysql-test/suite/sys_vars/t/log_tc_size_basic.test
 share/mysql-test/suite/sys_vars/t/log_warnings_basic.test
@@ -16238,6 +17037,7 @@ share/mysql-test/suite/sys_vars/t/max_binlog_size_basic.test
 share/mysql-test/suite/sys_vars/t/max_binlog_size_grant.test
 share/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_basic.test
 share/mysql-test/suite/sys_vars/t/max_binlog_stmt_cache_size_grant.test
+share/mysql-test/suite/sys_vars/t/max_binlog_total_size_basic.test
 share/mysql-test/suite/sys_vars/t/max_connect_errors_basic.test
 share/mysql-test/suite/sys_vars/t/max_connect_errors_grant.test
 share/mysql-test/suite/sys_vars/t/max_connections_basic.test
@@ -16246,7 +17046,6 @@ share/mysql-test/suite/sys_vars/t/max_delayed_threads_basic.test
 share/mysql-test/suite/sys_vars/t/max_digest_length_basic.test
 share/mysql-test/suite/sys_vars/t/max_error_count_basic.test
 share/mysql-test/suite/sys_vars/t/max_heap_table_size_basic.test
-share/mysql-test/suite/sys_vars/t/max_insert_delayed_threads_basic.test
 share/mysql-test/suite/sys_vars/t/max_join_size_basic.test
 share/mysql-test/suite/sys_vars/t/max_join_size_func.test
 share/mysql-test/suite/sys_vars/t/max_length_for_sort_data_basic.test
@@ -16260,7 +17059,6 @@ 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
 share/mysql-test/suite/sys_vars/t/max_statement_time_basic.test
-share/mysql-test/suite/sys_vars/t/max_tmp_tables_basic.test
 share/mysql-test/suite/sys_vars/t/max_user_connections-2.test
 share/mysql-test/suite/sys_vars/t/max_user_connections_basic-master.opt
 share/mysql-test/suite/sys_vars/t/max_user_connections_basic.test
@@ -16269,6 +17067,10 @@ share/mysql-test/suite/sys_vars/t/max_user_connections_func.test
 share/mysql-test/suite/sys_vars/t/max_write_lock_count_basic.test
 share/mysql-test/suite/sys_vars/t/maximum_basic-master.opt
 share/mysql-test/suite/sys_vars/t/maximum_basic.test
+share/mysql-test/suite/sys_vars/t/mdev_15935.test
+share/mysql-test/suite/sys_vars/t/mdev_32254.test
+share/mysql-test/suite/sys_vars/t/mdev_32525.test
+share/mysql-test/suite/sys_vars/t/mdev_32640.test
 share/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic-master.opt
 share/mysql-test/suite/sys_vars/t/metadata_locks_cache_size_basic.test
 share/mysql-test/suite/sys_vars/t/metadata_locks_hash_instances_basic.test
@@ -16294,7 +17096,6 @@ share/mysql-test/suite/sys_vars/t/net_buffer_length_basic.test
 share/mysql-test/suite/sys_vars/t/net_read_timeout_basic.test
 share/mysql-test/suite/sys_vars/t/net_retry_count_basic.test
 share/mysql-test/suite/sys_vars/t/net_write_timeout_basic.test
-share/mysql-test/suite/sys_vars/t/old_alter_table_basic.test
 share/mysql-test/suite/sys_vars/t/old_basic.test
 share/mysql-test/suite/sys_vars/t/old_mode_basic.test
 share/mysql-test/suite/sys_vars/t/old_passwords_basic.test
@@ -16384,6 +17185,7 @@ share/mysql-test/suite/sys_vars/t/protocol_version_basic.test
 share/mysql-test/suite/sys_vars/t/proxy_protocol_networks_grant.test
 share/mysql-test/suite/sys_vars/t/proxy_user_basic.test
 share/mysql-test/suite/sys_vars/t/pseudo_slave_mode_basic.test
+share/mysql-test/suite/sys_vars/t/pseudo_slave_mode_notembedded.test
 share/mysql-test/suite/sys_vars/t/pseudo_thread_id_basic.test
 share/mysql-test/suite/sys_vars/t/query_alloc_block_size_basic.test
 share/mysql-test/suite/sys_vars/t/query_cache_limit_basic.test
@@ -16406,6 +17208,8 @@ share/mysql-test/suite/sys_vars/t/read_only_basic.test
 share/mysql-test/suite/sys_vars/t/read_only_func.test
 share/mysql-test/suite/sys_vars/t/read_only_grant.test
 share/mysql-test/suite/sys_vars/t/read_rnd_buffer_size_basic.test
+share/mysql-test/suite/sys_vars/t/redirect.opt
+share/mysql-test/suite/sys_vars/t/redirect.test
 share/mysql-test/suite/sys_vars/t/relay_log_basename_basic.test
 share/mysql-test/suite/sys_vars/t/relay_log_basic.test
 share/mysql-test/suite/sys_vars/t/relay_log_index_basic.test
@@ -16426,6 +17230,8 @@ share/mysql-test/suite/sys_vars/t/replicate_ignore_db_basic.test
 share/mysql-test/suite/sys_vars/t/replicate_ignore_db_grant.test
 share/mysql-test/suite/sys_vars/t/replicate_ignore_table_basic.test
 share/mysql-test/suite/sys_vars/t/replicate_ignore_table_grant.test
+share/mysql-test/suite/sys_vars/t/replicate_rewrite_db.opt
+share/mysql-test/suite/sys_vars/t/replicate_rewrite_db.test
 share/mysql-test/suite/sys_vars/t/replicate_wild_do_table_basic.test
 share/mysql-test/suite/sys_vars/t/replicate_wild_do_table_grant.test
 share/mysql-test/suite/sys_vars/t/replicate_wild_ignore_table_basic.test
@@ -16516,13 +17322,9 @@ share/mysql-test/suite/sys_vars/t/slave_transaction_retry_interval_basic.test
 share/mysql-test/suite/sys_vars/t/slave_transaction_retry_interval_grant.test
 share/mysql-test/suite/sys_vars/t/slave_type_conversions_basic.test
 share/mysql-test/suite/sys_vars/t/slave_type_conversions_grant.test
-share/mysql-test/suite/sys_vars/t/slow_launch_time_basic.test
 share/mysql-test/suite/sys_vars/t/slow_launch_time_func-master.opt
 share/mysql-test/suite/sys_vars/t/slow_launch_time_func.test
 share/mysql-test/suite/sys_vars/t/slow_launch_time_grant.test
-share/mysql-test/suite/sys_vars/t/slow_query_log_basic.test
-share/mysql-test/suite/sys_vars/t/slow_query_log_file_basic-master.opt
-share/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
 share/mysql-test/suite/sys_vars/t/slow_query_log_file_func-master.opt
 share/mysql-test/suite/sys_vars/t/slow_query_log_file_func.test
 share/mysql-test/suite/sys_vars/t/slow_query_log_func.test
@@ -16541,7 +17343,6 @@ share/mysql-test/suite/sys_vars/t/sql_log_off_func.test
 share/mysql-test/suite/sys_vars/t/sql_low_priority_updates_func.test
 share/mysql-test/suite/sys_vars/t/sql_mode_basic.test
 share/mysql-test/suite/sys_vars/t/sql_mode_func.test
-share/mysql-test/suite/sys_vars/t/sql_notes_basic.test
 share/mysql-test/suite/sys_vars/t/sql_notes_func.test
 share/mysql-test/suite/sys_vars/t/sql_quote_show_create_basic.test
 share/mysql-test/suite/sys_vars/t/sql_quote_show_create_func.test
@@ -16608,7 +17409,6 @@ share/mysql-test/suite/sys_vars/t/thread_pool_size_high.test
 share/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_basic.test
 share/mysql-test/suite/sys_vars/t/thread_pool_stall_limit_grant.test
 share/mysql-test/suite/sys_vars/t/thread_stack_basic.test
-share/mysql-test/suite/sys_vars/t/time_format_basic.test
 share/mysql-test/suite/sys_vars/t/time_zone_basic.test
 share/mysql-test/suite/sys_vars/t/time_zone_func.test
 share/mysql-test/suite/sys_vars/t/timestamp_basic.test
@@ -16619,12 +17419,14 @@ share/mysql-test/suite/sys_vars/t/tmp_disk_table_size_basic.test
 share/mysql-test/suite/sys_vars/t/tmp_disk_table_size_func.test
 share/mysql-test/suite/sys_vars/t/tmpdir_basic.test
 share/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
+share/mysql-test/suite/sys_vars/t/transaction_isolation_basic.test
+share/mysql-test/suite/sys_vars/t/transaction_isolation_func-master.opt
+share/mysql-test/suite/sys_vars/t/transaction_isolation_func.test
 share/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
 share/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
-share/mysql-test/suite/sys_vars/t/tx_isolation_basic.test
-share/mysql-test/suite/sys_vars/t/tx_isolation_func-master.opt
-share/mysql-test/suite/sys_vars/t/tx_isolation_func.test
-share/mysql-test/suite/sys_vars/t/tx_read_only_basic.test
+share/mysql-test/suite/sys_vars/t/transaction_read_only_basic.test
+share/mysql-test/suite/sys_vars/t/tx_compatibility-master.opt
+share/mysql-test/suite/sys_vars/t/tx_compatibility.test
 share/mysql-test/suite/sys_vars/t/unique_checks_basic.test
 share/mysql-test/suite/sys_vars/t/updatable_views_with_limit_basic.test
 share/mysql-test/suite/sys_vars/t/updatable_views_with_limit_func.test
@@ -16642,7 +17444,6 @@ share/mysql-test/suite/sys_vars/t/wait_timeout_basic.test
 share/mysql-test/suite/sys_vars/t/wait_timeout_func.test
 share/mysql-test/suite/sys_vars/t/warning_count_basic.test
 share/mysql-test/suite/sys_vars/t/wsrep_auto_increment_control_basic.test
-share/mysql-test/suite/sys_vars/t/wsrep_causal_reads_basic.test
 share/mysql-test/suite/sys_vars/t/wsrep_certify_nonpk_basic.test
 share/mysql-test/suite/sys_vars/t/wsrep_cluster_address_basic.test
 share/mysql-test/suite/sys_vars/t/wsrep_cluster_name_basic.test
@@ -16708,6 +17509,7 @@ share/mysql-test/suite/sysschema/r/fn_ps_thread_trx_info.result
 share/mysql-test/suite/sysschema/r/fn_quote_identifier.result
 share/mysql-test/suite/sysschema/r/fn_sys_get_config.result
 share/mysql-test/suite/sysschema/r/mysqldump.result
+share/mysql-test/suite/sysschema/r/optimizer_switch.result
 share/mysql-test/suite/sysschema/r/pr_create_synonym_db.result
 share/mysql-test/suite/sysschema/r/pr_diagnostics.result
 share/mysql-test/suite/sysschema/r/pr_execute_prepared_stmt.result
@@ -16743,6 +17545,7 @@ share/mysql-test/suite/sysschema/r/v_memory_by_user_by_current_bytes.result
 share/mysql-test/suite/sysschema/r/v_memory_global_by_current_bytes.result
 share/mysql-test/suite/sysschema/r/v_memory_global_total.result
 share/mysql-test/suite/sysschema/r/v_metrics.result
+share/mysql-test/suite/sysschema/r/v_privileges_by_table_by_level.result
 share/mysql-test/suite/sysschema/r/v_processlist.result
 share/mysql-test/suite/sysschema/r/v_ps_check_lost_instrumentation.result
 share/mysql-test/suite/sysschema/r/v_ps_digest_95th_percentile_by_avg_us.result
@@ -16801,6 +17604,7 @@ share/mysql-test/suite/sysschema/t/fn_ps_thread_trx_info.test
 share/mysql-test/suite/sysschema/t/fn_quote_identifier.test
 share/mysql-test/suite/sysschema/t/fn_sys_get_config.test
 share/mysql-test/suite/sysschema/t/mysqldump.test
+share/mysql-test/suite/sysschema/t/optimizer_switch.test
 share/mysql-test/suite/sysschema/t/pr_create_synonym_db.test
 share/mysql-test/suite/sysschema/t/pr_diagnostics.test
 share/mysql-test/suite/sysschema/t/pr_execute_prepared_stmt.test
@@ -16836,6 +17640,7 @@ share/mysql-test/suite/sysschema/t/v_memory_by_user_by_current_bytes.test
 share/mysql-test/suite/sysschema/t/v_memory_global_by_current_bytes.test
 share/mysql-test/suite/sysschema/t/v_memory_global_total.test
 share/mysql-test/suite/sysschema/t/v_metrics.test
+share/mysql-test/suite/sysschema/t/v_privileges_by_table_by_level.test
 share/mysql-test/suite/sysschema/t/v_processlist.test
 share/mysql-test/suite/sysschema/t/v_ps_check_lost_instrumentation.test
 share/mysql-test/suite/sysschema/t/v_ps_digest_95th_percentile_by_avg_us.test
@@ -16872,6 +17677,7 @@ share/mysql-test/suite/sysschema/t/v_waits_by_user_by_latency.test
 share/mysql-test/suite/sysschema/t/v_waits_global_by_latency.test
 share/mysql-test/suite/sysschema/t/version_functions.test
 share/mysql-test/suite/unit/
+share/mysql-test/suite/unit/disabled.def
 share/mysql-test/suite/unit/suite.pm
 share/mysql-test/suite/vcol/
 share/mysql-test/suite/vcol/disabled.def
@@ -16896,6 +17702,7 @@ share/mysql-test/suite/vcol/r/binlog.result
 share/mysql-test/suite/vcol/r/charsets.result
 share/mysql-test/suite/vcol/r/cross_db.result
 share/mysql-test/suite/vcol/r/delayed.result
+share/mysql-test/suite/vcol/r/func_regexp.result
 share/mysql-test/suite/vcol/r/index.result
 share/mysql-test/suite/vcol/r/innodb_autoinc_vcol.result
 share/mysql-test/suite/vcol/r/innodb_virtual_fk.result
@@ -16942,6 +17749,7 @@ share/mysql-test/suite/vcol/r/vcol_supported_sql_funcs.result
 share/mysql-test/suite/vcol/r/vcol_syntax.result
 share/mysql-test/suite/vcol/r/vcol_trigger_sp_innodb.result
 share/mysql-test/suite/vcol/r/vcol_trigger_sp_myisam.result
+share/mysql-test/suite/vcol/r/vcol_utf32.result
 share/mysql-test/suite/vcol/r/vcol_view_innodb.result
 share/mysql-test/suite/vcol/r/vcol_view_myisam.result
 share/mysql-test/suite/vcol/r/wrong_arena.result
@@ -16951,6 +17759,7 @@ share/mysql-test/suite/vcol/t/binlog.test
 share/mysql-test/suite/vcol/t/charsets.test
 share/mysql-test/suite/vcol/t/cross_db.test
 share/mysql-test/suite/vcol/t/delayed.test
+share/mysql-test/suite/vcol/t/func_regexp.test
 share/mysql-test/suite/vcol/t/index.test
 share/mysql-test/suite/vcol/t/innodb_autoinc_vcol.test
 share/mysql-test/suite/vcol/t/innodb_virtual_fk.test
@@ -17001,6 +17810,7 @@ share/mysql-test/suite/vcol/t/vcol_supported_sql_funcs_main.inc
 share/mysql-test/suite/vcol/t/vcol_syntax.test
 share/mysql-test/suite/vcol/t/vcol_trigger_sp_innodb.test
 share/mysql-test/suite/vcol/t/vcol_trigger_sp_myisam.test
+share/mysql-test/suite/vcol/t/vcol_utf32.test
 share/mysql-test/suite/vcol/t/vcol_view_innodb.test
 share/mysql-test/suite/vcol/t/vcol_view_myisam.test
 share/mysql-test/suite/vcol/t/wrong_arena.test
@@ -17018,6 +17828,7 @@ share/mysql-test/suite/versioning/key_type.inc
 share/mysql-test/suite/versioning/r/
 share/mysql-test/suite/versioning/r/alter.result
 share/mysql-test/suite/versioning/r/autoinc.result
+share/mysql-test/suite/versioning/r/binlog.result
 share/mysql-test/suite/versioning/r/commit_id.result
 share/mysql-test/suite/versioning/r/create.result
 share/mysql-test/suite/versioning/r/cte.result
@@ -17041,7 +17852,6 @@ 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
 share/mysql-test/suite/versioning/r/select2.result
@@ -17055,6 +17865,7 @@ share/mysql-test/suite/versioning/r/view.result
 share/mysql-test/suite/versioning/t/
 share/mysql-test/suite/versioning/t/alter.test
 share/mysql-test/suite/versioning/t/autoinc.test
+share/mysql-test/suite/versioning/t/binlog.test
 share/mysql-test/suite/versioning/t/commit_id.test
 share/mysql-test/suite/versioning/t/create.test
 share/mysql-test/suite/versioning/t/cte.test
@@ -17083,6 +17894,7 @@ share/mysql-test/suite/versioning/t/select.test
 share/mysql-test/suite/versioning/t/select2.test
 share/mysql-test/suite/versioning/t/simple.test
 share/mysql-test/suite/versioning/t/sysvars.test
+share/mysql-test/suite/versioning/t/trx_id.opt
 share/mysql-test/suite/versioning/t/trx_id.test
 share/mysql-test/suite/versioning/t/update-big.test
 share/mysql-test/suite/versioning/t/update.test
@@ -17097,16 +17909,14 @@ share/mysql-test/suite/wsrep/include/check_galera_version.inc
 share/mysql-test/suite/wsrep/my.cnf
 share/mysql-test/suite/wsrep/r/
 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/MDEV-33997.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/plugin.result
 share/mysql-test/suite/wsrep/r/pool_of_threads.result
@@ -17117,22 +17927,25 @@ 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_on_basic.result
+share/mysql-test/suite/wsrep/r/wsrep_provider_plugin.result
+share/mysql-test/suite/wsrep/r/wsrep_provider_plugin_basic.result
+share/mysql-test/suite/wsrep/r/wsrep_provider_plugin_defaults.result
+share/mysql-test/suite/wsrep/r/wsrep_provider_plugin_wsrep_off.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_sst_method.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/
 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/MDEV-33997.cnf
+share/mysql-test/suite/wsrep/t/MDEV-33997.combinations
+share/mysql-test/suite/wsrep/t/MDEV-33997.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
@@ -17144,8 +17957,6 @@ 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
 share/mysql-test/suite/wsrep/t/mdev_7798.test
 share/mysql-test/suite/wsrep/t/plugin.opt
@@ -17167,10 +17978,18 @@ 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_on_basic.opt
 share/mysql-test/suite/wsrep/t/wsrep_on_basic.test
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin.cnf
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin.test
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_basic.cnf
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_basic.test
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.cnf
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_defaults.test
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.cnf
+share/mysql-test/suite/wsrep/t/wsrep_provider_plugin_wsrep_off.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_sst_method.cnf
+share/mysql-test/suite/wsrep/t/wsrep_variables_sst_method.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/valgrind.supp