update to MariaDB 10.9.4, tidy arch-specific parts of the Makefile,

build rocksdb on other 64-bit LE archs, and add run-time hw feature detection for OpenBSD/arm64. From Brad.
2022-11-09 12:12:44 +00:00 · 2022-11-09 12:12:44 +00:00 · 79f9ff8075
parent 860b6e370c
commit 79f9ff8075
10 changed files with 407 additions and 91 deletions
--- a/databases/mariadb/Makefile
+++ b/databases/mariadb/Makefile
@ -2,14 +2,10 @@ COMMENT-main=	multithreaded SQL database (client)
 COMMENT-server=	multithreaded SQL database (server)
 COMMENT-tests=	multithreaded SQL database (regression test suite/benchmark)

-VERSION=	10.9.3
+VERSION=	10.9.4
 DISTNAME=	mariadb-${VERSION}
 PKGNAME-main=	mariadb-client-${VERSION}
-REVISION-server= 2
-REVISION-tests=	2
 EPOCH=		1
-REVISION-main=	0
-
 CATEGORIES=	databases
 MASTER_SITES=	https://downloads.mariadb.com/MariaDB/${DISTNAME}/source/ \
 		https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/
@ -95,11 +91,13 @@ CONFIGURE_ARGS+=-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
 # force disabling the PAM auth plugin if OpenPAM is installed
 CONFIGURE_ARGS+=-DHAVE_PAM_APPL_H=0

-# The ColumnStore storage engine is disabled.
-# ColumnStore is only buildable on X86.
+# The ColumnStore storage engine is disabled. ColumnStore is only
+# buildable on X86.
 CONFIGURE_ARGS+=-DPLUGIN_COLUMNSTORE=NO

-.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "riscv64"
+.include <bsd.port.arch.mk>
+
+.if !${PROPERTIES:Mlp64} || ${PROPERTIES:Mbe}
 CONFIGURE_ARGS+=-DWITHOUT_ROCKSDB_STORAGE_ENGINE=1
 .endif

@ -114,15 +112,13 @@ LDFLAGS+=	-latomic
 WANTLIB+=	atomic
 .endif

-.include <bsd.port.arch.mk>
-
 .if ${PROPERTIES:Mle}
 PKG_ARGS+=	-Dle=1
 .else
 PKG_ARGS+=	-Dle=0
 .endif

-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "riscv64"
+.if ${PROPERTIES:Mlp64} && ${PROPERTIES:Mle}
 PKG_ARGS+=	-Drocksdb=1
 .else
 PKG_ARGS+=	-Drocksdb=0
@ -142,7 +138,7 @@ post-install:
 		ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient.so.${LIBmysqlclient_VERSION} && \
 		ln -sf libmariadb.so.${LIBmariadb_VERSION} libmysqlclient_r.so.${LIBmysqlclient_r_VERSION}
 	${INSTALL_DATA} ${FILESDIR}/my.cnf ${PREFIX}/share/examples/mysql/
-.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "riscv64"
+.if !${PROPERTIES:Mlp64} || ${PROPERTIES:Mbe}
 	rm -f ${PREFIX}/man/man1/myrocks_hotbackup.1
 	rm -Rf ${PREFIX}/share/mysql-test/plugin/rocksdb/
 .endif
--- a/databases/mariadb/distinfo
+++ b/databases/mariadb/distinfo
@ -1,2 +1,2 @@
-SHA256 (mariadb-10.9.3.tar.gz) = mh4imXL8zMgnDmM/aNP7gk2hUdz09T2h342UesqHa+4=
-SIZE (mariadb-10.9.3.tar.gz) = 97243702
+SHA256 (mariadb-10.9.4.tar.gz) = Hf8IoPN+pc+PAMvRLUDoB1n659cxhMz1a1tRrP3PwFQ=
+SIZE (mariadb-10.9.4.tar.gz) = 95508132
--- a/databases/mariadb/patches/patch-include_my_alarm_h
+++ b/databases/mariadb/patches/patch-include_my_alarm_h
@ -0,0 +1,17 @@
+Fix warning with signal typedef for *BSD
+7d96cb4703693cbf7a23308cfffee955022c86a9
+
+Index: include/my_alarm.h
+--- include/my_alarm.h.orig
+++ include/my_alarm.h
+@@ -31,7 +31,9 @@ extern ulong my_time_to_wait_for_lock;
+ #include <signal.h>
+ #ifdef HAVE_SIGHANDLER_T
+ #define sig_return sighandler_t
+-#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || defined(__FreeBSD__) || defined(_AIX)
+#elif defined(SOLARIS) || defined(__sun) || defined(__APPLE__) || \
+    defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
+    defined(__DragonFly__) || defined(_AIX)
+ typedef void (*sig_return)(int); /* Returns type from signal */
+ #else
+ typedef void (*sig_return)(void); /* Returns type from signal */
--- a/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt
+++ b/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt
@ -1,10 +1,7 @@
-Rocksdb: Add initial OpenBSD support
-055cb3fcd1aec2a05908a312a2ae4dfd3a0d4d81
-
 Index: storage/rocksdb/CMakeLists.txt
 --- storage/rocksdb/CMakeLists.txt.orig
 +++ storage/rocksdb/CMakeLists.txt
-@@ -51,15 +51,6 @@ IF(MSVC_ARM64)
+@@ -53,15 +53,6 @@ IF(MSVC_ARM64)
  SKIP_ROCKSDB_PLUGIN("Windows ARM64 not supported")
 ENDIF()
 
@ -20,21 +17,3 @@ 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)
-@@ -191,7 +182,7 @@ ADD_DEPENDENCIES(rocksdb_aux_lib GenError)
- 
- # MARIAROCKS-TODO: how to properly depend on -lrt ?
- TARGET_LINK_LIBRARIES(rocksdb_aux_lib rocksdblib ${ZLIB_LIBRARY})
-if (UNIX AND NOT APPLE)
-+if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-   TARGET_LINK_LIBRARIES(rocksdb_aux_lib -lrt)
- endif()
- TARGET_LINK_LIBRARIES(rocksdb_aux_lib ${ATOMIC_EXTRA_LIBS})
-@@ -242,7 +233,7 @@ ENDIF()
- #  ADD_SUBDIRECTORY(unittest)
- #ENDIF()
- 
-if (UNIX AND NOT APPLE)
-+if (UNIX AND NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-   SET(rocksdb_static_libs ${rocksdb_static_libs} "-lrt")
- endif()
- 
--- a/databases/mariadb/patches/patch-storage_rocksdb_ha_rocksdb_cc
+++ b/databases/mariadb/patches/patch-storage_rocksdb_ha_rocksdb_cc
@ -1,51 +0,0 @@
-Rocksdb: Add initial OpenBSD support
-055cb3fcd1aec2a05908a312a2ae4dfd3a0d4d81
-
-Index: storage/rocksdb/ha_rocksdb.cc
--- storage/rocksdb/ha_rocksdb.cc.orig
-+++ storage/rocksdb/ha_rocksdb.cc
-@@ -266,7 +266,7 @@ Rdb_cf_manager cf_manager;
- Rdb_ddl_manager ddl_manager;
- Rdb_binlog_manager binlog_manager;
- 
-#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
- Rdb_io_watchdog *io_watchdog = nullptr;
- #endif
- /**
-@@ -851,7 +851,7 @@ static void rocksdb_set_io_write_timeout(
-     void *const var_ptr MY_ATTRIBUTE((__unused__)), const void *const save) {
-   DBUG_ASSERT(save != nullptr);
-   DBUG_ASSERT(rdb != nullptr);
-#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
-   DBUG_ASSERT(io_watchdog != nullptr);
- #endif
- 
-@@ -860,7 +860,7 @@ static void rocksdb_set_io_write_timeout(
-   const uint32_t new_val = *static_cast<const uint32_t *>(save);
- 
-   rocksdb_io_write_timeout_secs = new_val;
-#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
-   io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
- #endif
-   RDB_MUTEX_UNLOCK_CHECK(rdb_sysvars_mutex);
-@@ -5794,7 +5794,7 @@ static int rocksdb_init_func(void *const p) {
-     directories.push_back(myrocks::rocksdb_wal_dir);
-   }
- 
-#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
-   io_watchdog = new Rdb_io_watchdog(std::move(directories));
-   io_watchdog->reset_timeout(rocksdb_io_write_timeout_secs);
- #endif
-@@ -5893,7 +5893,7 @@ static int rocksdb_done_func(void *const p) {
-   delete commit_latency_stats;
-   commit_latency_stats = nullptr;
- 
-#if !defined(_WIN32) && !defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__OpenBSD__)
-   delete io_watchdog;
-   io_watchdog = nullptr;
- #endif
--- a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
+++ b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
@ -0,0 +1,209 @@
+- Check for sys/auxv.h
+  https://github.com/facebook/rocksdb/commit/8bbd76edbfd0c187960aae31d107a9a0fa71472c
+- Fix RocksDB SIGILL error on Raspberry PI 4
+  https://github.com/facebook/rocksdb/commit/29f7bbef995bdf83098963799c66af742e95373f
+- Fix compilation on Apple Silicon
+  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
+
+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 @@
+ 
+ #include "util/crc32c_arm64.h"
+ 
+-#if defined(__linux__) && defined(HAVE_ARM64_CRC)
+#if defined(HAVE_ARM64_CRC)
+ 
+#if defined(__linux__)
+ #include <asm/hwcap.h>
+#endif
+#ifdef ROCKSDB_AUXV_GETAUXVAL_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 @@
+   } while (0)
+ #endif
+ 
+extern bool pmull_runtime_flag;
+
+ uint32_t crc32c_runtime_check(void) {
+-  uint64_t auxv = getauxval(AT_HWCAP);
+#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__)
+  uint64_t auxv = 0;
+#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT)
+  auxv = getauxval(AT_HWCAP);
+#elif defined(__FreeBSD__)
+  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
+ }
+ 
+-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__)
+  uint64_t auxv = 0;
+#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT)
+  auxv = getauxval(AT_HWCAP);
+#elif defined(__FreeBSD__)
+  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
+}
+
+uint32_t
+crc32c_arm64(uint32_t crc, unsigned char const *data, size_t len) {
+   const uint8_t *buf8;
+   const uint64_t *buf64 = (uint64_t *)data;
+   int length = (int)len;
+   crc ^= 0xffffffff;
+ 
+  /*
+   * Pmull runtime check here.
+   * Raspberry Pi supports crc32 but doesn't support pmull.
+   * Skip Crc32c Parallel computation if no crypto extension available.
+   */
+  if (pmull_runtime_flag) {
+/* Macro (HAVE_ARM64_CRYPTO) is used for compiling check  */
+ #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
+  *   One Block: 42(BLK_LENGTH) * 8(step length: crc32c_u64) bytes
+  */
+ #define BLK_LENGTH 42
+-  while (length >= 1024) {
+-    uint64_t t0, t1;
+-    uint32_t crc0 = 0, crc1 = 0, crc2 = 0;
+    while (length >= 1024) {
+      uint64_t t0, t1;
+      uint32_t crc0 = 0, crc1 = 0, crc2 = 0;
+ 
+-    /* Parallel Param:
+-     *   k0 = CRC32(x ^ (42 * 8 * 8 * 2 - 1));
+-     *   k1 = CRC32(x ^ (42 * 8 * 8 - 1));
+-     */
+-    uint32_t k0 = 0xe417f38a, k1 = 0x8f158014;
+      /* Parallel Param:
+       *   k0 = CRC32(x ^ (42 * 8 * 8 * 2 - 1));
+       *   k1 = CRC32(x ^ (42 * 8 * 8 - 1));
+       */
+      uint32_t k0 = 0xe417f38a, k1 = 0x8f158014;
+ 
+-    /* Prefetch data for following block to avoid cache miss */
+-    PREF1KL1((uint8_t *)buf64, 1024);
+      /* Prefetch data for following block to avoid cache miss */
+      PREF1KL1((uint8_t *)buf64, 1024);
+ 
+-    /* First 8 byte for better pipelining */
+-    crc0 = crc32c_u64(crc, *buf64++);
+      /* First 8 byte for better pipelining */
+      crc0 = crc32c_u64(crc, *buf64++);
+ 
+-    /* 3 blocks crc32c parallel computation
+-     * Macro unfolding to compute parallelly
+-     * 168 * 6 = 1008 (bytes)
+-     */
+-    CRC32C7X24BYTES(0);
+-    CRC32C7X24BYTES(1);
+-    CRC32C7X24BYTES(2);
+-    CRC32C7X24BYTES(3);
+-    CRC32C7X24BYTES(4);
+-    CRC32C7X24BYTES(5);
+-    buf64 += (BLK_LENGTH * 3);
+      /* 3 blocks crc32c parallel computation
+       * Macro unfolding to compute parallelly
+       * 168 * 6 = 1008 (bytes)
+       */
+      CRC32C7X24BYTES(0);
+      CRC32C7X24BYTES(1);
+      CRC32C7X24BYTES(2);
+      CRC32C7X24BYTES(3);
+      CRC32C7X24BYTES(4);
+      CRC32C7X24BYTES(5);
+      buf64 += (BLK_LENGTH * 3);
+ 
+-    /* Last 8 bytes */
+-    crc = crc32c_u64(crc2, *buf64++);
+      /* Last 8 bytes */
+      crc = crc32c_u64(crc2, *buf64++);
+ 
+-    t0 = (uint64_t)vmull_p64(crc0, k0);
+-    t1 = (uint64_t)vmull_p64(crc1, k1);
+      t0 = (uint64_t)vmull_p64(crc0, k0);
+      t1 = (uint64_t)vmull_p64(crc1, k1);
+ 
+-    /* Merge (crc0, crc1, crc2) -> crc */
+-    crc1 = crc32c_u64(0, t1);
+-    crc ^= crc1;
+-    crc0 = crc32c_u64(0, t0);
+-    crc ^= crc0;
+      /* Merge (crc0, crc1, crc2) -> crc */
+      crc1 = crc32c_u64(0, t1);
+      crc ^= crc1;
+      crc0 = crc32c_u64(0, t0);
+      crc ^= crc0;
+ 
+-    length -= 1024;
+-  }
+      length -= 1024;
+    }
+ 
+-  if (length == 0) return crc ^ (0xffffffffU);
+    if (length == 0) return crc ^ (0xffffffffU);
+ #endif
+  }  // if Pmull runtime check here
+
+   buf8 = (const uint8_t *)buf64;
+   while (length >= 8) {
+     crc = crc32c_u64(crc, *(const uint64_t *)buf8);
--- a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h
+++ b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h
@ -0,0 +1,30 @@
+- Fix RocksDB SIGILL error on Raspberry PI 4
+  https://github.com/facebook/rocksdb/commit/29f7bbef995bdf83098963799c66af742e95373f
+- Fix compilation on Apple Silicon
+  https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
+
+https://jira.mariadb.org/browse/MDEV-29875
+
+Index: storage/rocksdb/rocksdb/util/crc32c_arm64.h
+--- storage/rocksdb/rocksdb/util/crc32c_arm64.h.orig
+++ storage/rocksdb/rocksdb/util/crc32c_arm64.h
+@@ -7,6 +7,7 @@
+ #define UTIL_CRC32C_ARM64_H
+ 
+ #include <cinttypes>
+#include <cstddef>
+ 
+ #if defined(__aarch64__) || defined(__AARCH64__)
+ 
+@@ -33,8 +34,10 @@
+   PREF4X64L1(buffer, (PREF_OFFSET), 8) \
+   PREF4X64L1(buffer, (PREF_OFFSET), 12)
+ 
+-extern uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data, unsigned len);
+extern uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data,
+                             size_t len);
+ extern uint32_t crc32c_runtime_check(void);
+extern bool crc32c_pmull_runtime_check(void);
+ 
+ #ifdef __ARM_FEATURE_CRYPTO
+ #define HAVE_ARM64_CRYPTO
--- a/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
+++ b/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
@ -0,0 +1,54 @@
+- Fix RocksDB SIGILL error on Raspberry PI 4
+  https://github.com/facebook/rocksdb/commit/29f7bbef995bdf83098963799c66af742e95373f
+- Fix compilation on Apple Silicon
+  https://github.com/facebook/rocksdb/commit/ee4bd4780b321ddb5f92a0f4eb956f2a2ebd60dc
+
+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 @@
+ 
+ #endif
+ 
+#if defined(HAVE_ARM64_CRC)
+bool pmull_runtime_flag = false;
+#endif
+
+ namespace ROCKSDB_NAMESPACE {
+ namespace crc32c {
+ 
+@@ -468,7 +472,7 @@ static bool isAltiVec() {
+ }
+ #endif
+ 
+-#if defined(__linux__) && defined(HAVE_ARM64_CRC)
+#if defined(HAVE_ARM64_CRC)
+ 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() {
+   has_fast_crc = false;
+   arch = "PPC";
+ #endif
+-#elif defined(__linux__) && defined(HAVE_ARM64_CRC)
+#elif defined(HAVE_ARM64_CRC)
+   if (crc32c_runtime_check()) {
+     has_fast_crc = true;
+     arch = "Arm64";
+    pmull_runtime_flag = crc32c_pmull_runtime_check();
+   } else {
+     has_fast_crc = false;
+     arch = "Arm64";
+@@ -1220,8 +1225,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>;
+-#elif defined(__linux__) && defined(HAVE_ARM64_CRC)
+#elif defined(HAVE_ARM64_CRC)
+   if(crc32c_runtime_check()) {
+    pmull_runtime_flag = crc32c_pmull_runtime_check();
+     return ExtendARMImpl;
+   } else {
+     return ExtendImpl<Slow_CRC32>;
--- a/databases/mariadb/pkg/PLIST-server
+++ b/databases/mariadb/pkg/PLIST-server
@ -228,6 +228,7 @@ include/mysql/server/private/log_event_old.h
 include/mysql/server/private/log_slow.h
 include/mysql/server/private/maria.h
 include/mysql/server/private/mariadb.h
+include/mysql/server/private/mariadb_capi_rename.h
 include/mysql/server/private/mdl.h
 include/mysql/server/private/mem_root_array.h
 include/mysql/server/private/message.h
@ -361,6 +362,7 @@ include/mysql/server/private/sql_crypt.h
 include/mysql/server/private/sql_cte.h
 include/mysql/server/private/sql_cursor.h
 include/mysql/server/private/sql_db.h
+include/mysql/server/private/sql_debug.h
 include/mysql/server/private/sql_delete.h
 include/mysql/server/private/sql_derived.h
 include/mysql/server/private/sql_digest.h
--- a/databases/mariadb/pkg/PLIST-tests
+++ b/databases/mariadb/pkg/PLIST-tests
@ -487,6 +487,7 @@ share/mysql-test/include/no_running_event_scheduler.inc
 share/mysql-test/include/no_running_events.inc
 share/mysql-test/include/no_utf8_cli.inc
 share/mysql-test/include/no_valgrind_without_big.inc
+share/mysql-test/include/no_view_protocol.inc
 share/mysql-test/include/not_aix.inc
 share/mysql-test/include/not_as_root.inc
 share/mysql-test/include/not_asan.inc
@ -772,6 +773,13 @@ share/mysql-test/main/alter_table_online.result
 share/mysql-test/main/alter_table_online.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
+share/mysql-test/main/alter_table_upgrade_aria.test
+share/mysql-test/main/alter_table_upgrade_mdev29481_myisam_aria.inc
+share/mysql-test/main/alter_table_upgrade_myisam.result
+share/mysql-test/main/alter_table_upgrade_myisam.test
+share/mysql-test/main/alter_table_upgrade_myisam_debug.result
+share/mysql-test/main/alter_table_upgrade_myisam_debug.test
 share/mysql-test/main/alter_user.result
 share/mysql-test/main/alter_user.test
 share/mysql-test/main/analyze.result
@ -835,6 +843,8 @@ share/mysql-test/main/backup_syntax.result
 share/mysql-test/main/backup_syntax.test
 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/bench_count_distinct.result
 share/mysql-test/main/bench_count_distinct.test
 share/mysql-test/main/bigint.result
@ -1792,6 +1802,8 @@ share/mysql-test/main/kill-2.result
 share/mysql-test/main/kill-2.test
 share/mysql-test/main/kill.result
 share/mysql-test/main/kill.test
+share/mysql-test/main/kill_debug.result
+share/mysql-test/main/kill_debug.test
 share/mysql-test/main/kill_processlist-6619.result
 share/mysql-test/main/kill_processlist-6619.test
 share/mysql-test/main/kill_query-6728.result
@ -2005,6 +2017,8 @@ share/mysql-test/main/myisam_crash_before_flush_keys.result
 share/mysql-test/main/myisam_crash_before_flush_keys.test
 share/mysql-test/main/myisam_debug.result
 share/mysql-test/main/myisam_debug.test
+share/mysql-test/main/myisam_debug_keys.result
+share/mysql-test/main/myisam_debug_keys.test
 share/mysql-test/main/myisam_enable_keys-10506.result
 share/mysql-test/main/myisam_enable_keys-10506.test
 share/mysql-test/main/myisam_explain_non_select_all.result
@ -3945,6 +3959,7 @@ share/mysql-test/plugin/spider/spider/bugfix/include/quick_mode_2_deinit.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/quick_mode_2_init.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/quick_mode_3_deinit.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/quick_mode_3_init.inc
+share/mysql-test/plugin/spider/spider/bugfix/include/restart_spider.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/return_found_rows_insert_deinit.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/return_found_rows_insert_init.inc
 share/mysql-test/plugin/spider/spider/bugfix/include/return_found_rows_update_deinit.inc
@ -4022,6 +4037,8 @@ share/mysql-test/plugin/spider/spider/bugfix/r/mdev_27240.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_28854.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29008.result
 share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29011.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29352.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_29484.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
@ -4114,6 +4131,9 @@ 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_29352.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/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
@ -4914,7 +4934,6 @@ 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-28727-pet4.frm
 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
@ -5021,6 +5040,14 @@ share/mysql-test/std_data/mysql_upgrade/
 share/mysql-test/std_data/mysql_upgrade/event.MYD
 share/mysql-test/std_data/mysql_upgrade/event.MYI
 share/mysql-test/std_data/mysql_upgrade/event.frm
+share/mysql-test/std_data/mysql_upgrade/mdev28822_100427_innodb.frm
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAD
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.MAI
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_aria.frm
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_innodb.frm
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYD
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.MYI
+share/mysql-test/std_data/mysql_upgrade/mdev29481_100104_myisam.frm
 share/mysql-test/std_data/mysql_upgrade/v1.frm
 share/mysql-test/std_data/mysql_upgrade/v1badcheck.frm
 share/mysql-test/std_data/mysql_upgrade/v2.frm
@ -5104,6 +5131,7 @@ share/mysql-test/std_data/words.dat
 share/mysql-test/std_data/words2.dat
 share/mysql-test/std_data/words3.dat
 share/mysql-test/std_data/wsrep_notify.sh
+share/mysql-test/std_data/wsrep_notify_ssl.sh
 share/mysql-test/std_data/zoneinfo/
 share/mysql-test/std_data/zoneinfo/GMT
 share/mysql-test/suite/
@ -5940,6 +5968,8 @@ share/mysql-test/suite/encryption/r/filekeys_encfile_badfile.result
 share/mysql-test/suite/encryption/r/filekeys_encfile_file.result
 share/mysql-test/suite/encryption/r/filekeys_encfile_no.result
 share/mysql-test/suite/encryption/r/filekeys_nofile.result
+share/mysql-test/suite/encryption/r/filekeys_secret_openssl_rand_128bits.result
+share/mysql-test/suite/encryption/r/filekeys_secret_too_long.result
 share/mysql-test/suite/encryption/r/filekeys_syntax.result
 share/mysql-test/suite/encryption/r/filekeys_tooshort.result
 share/mysql-test/suite/encryption/r/filekeys_unencfile.result
@ -6016,6 +6046,7 @@ share/mysql-test/suite/encryption/t/encryption_key_corruption.opt
 share/mysql-test/suite/encryption/t/encryption_key_corruption.test
 share/mysql-test/suite/encryption/t/file_creation.opt
 share/mysql-test/suite/encryption/t/file_creation.test
+share/mysql-test/suite/encryption/t/filekeys-data-too-long.key
 share/mysql-test/suite/encryption/t/filekeys-data.enc
 share/mysql-test/suite/encryption/t/filekeys-data.key
 share/mysql-test/suite/encryption/t/filekeys-tooshort.enc
@ -6037,6 +6068,12 @@ share/mysql-test/suite/encryption/t/filekeys_nofile.test
 share/mysql-test/suite/encryption/t/filekeys_plugin.inc
 share/mysql-test/suite/encryption/t/filekeys_plugin.opt
 share/mysql-test/suite/encryption/t/filekeys_plugin_exists.inc
+share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.enc
+share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.key
+share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.opt
+share/mysql-test/suite/encryption/t/filekeys_secret_openssl_rand_128bits.test
+share/mysql-test/suite/encryption/t/filekeys_secret_too_long.opt
+share/mysql-test/suite/encryption/t/filekeys_secret_too_long.test
 share/mysql-test/suite/encryption/t/filekeys_syntax.opt
 share/mysql-test/suite/encryption/t/filekeys_syntax.test
 share/mysql-test/suite/encryption/t/filekeys_tooshort.opt
@ -7532,11 +7569,14 @@ 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-25740.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-27713.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
 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
@ -7845,6 +7885,7 @@ 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
 share/mysql-test/suite/galera/r/galera_var_replicate_aria_off.result
 share/mysql-test/suite/galera/r/galera_var_replicate_aria_on.result
@ -7950,14 +7991,18 @@ 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-25740.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
 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-27713.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
 share/mysql-test/suite/galera/t/MDEV-28053.test
+share/mysql-test/suite/galera/t/MDEV-29142.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
@ -8374,6 +8419,9 @@ 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
+share/mysql-test/suite/galera/t/galera_var_notify_ssl_ipv6.cnf
+share/mysql-test/suite/galera/t/galera_var_notify_ssl_ipv6.test
 share/mysql-test/suite/galera/t/galera_var_reject_queries.test
 share/mysql-test/suite/galera/t/galera_var_replicate_aria_off.test
 share/mysql-test/suite/galera/t/galera_var_replicate_aria_on.test
@ -9053,6 +9101,7 @@ share/mysql-test/suite/innodb/r/alter_persistent_autoinc.result
 share/mysql-test/suite/innodb/r/alter_primary_key.result
 share/mysql-test/suite/innodb/r/alter_rename_existing.result
 share/mysql-test/suite/innodb/r/alter_table.result
+share/mysql-test/suite/innodb/r/alter_table_upgrade.result
 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
@ -9093,6 +9142,8 @@ share/mysql-test/suite/innodb/r/ddl_purge.result
 share/mysql-test/suite/innodb/r/deadlock_detect,ON.rdiff
 share/mysql-test/suite/innodb/r/deadlock_detect.result
 share/mysql-test/suite/innodb/r/deadlock_victim_race.result
+share/mysql-test/suite/innodb/r/deadlock_wait_lock_race.result
+share/mysql-test/suite/innodb/r/deadlock_wait_thr_race.result
 share/mysql-test/suite/innodb/r/default_row_format_alter,compact.rdiff
 share/mysql-test/suite/innodb/r/default_row_format_alter,redundant.rdiff
 share/mysql-test/suite/innodb/r/default_row_format_alter.result
@ -9368,6 +9419,7 @@ 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_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
@ -9494,6 +9546,7 @@ share/mysql-test/suite/innodb/t/alter_rename_existing.test
 share/mysql-test/suite/innodb/t/alter_sql_mode.combinations
 share/mysql-test/suite/innodb/t/alter_sql_mode.inc
 share/mysql-test/suite/innodb/t/alter_table.test
+share/mysql-test/suite/innodb/t/alter_table_upgrade.test
 share/mysql-test/suite/innodb/t/alter_varchar_change.test
 share/mysql-test/suite/innodb/t/analyze_table.test
 share/mysql-test/suite/innodb/t/auto_increment_dup.opt
@ -9529,6 +9582,10 @@ share/mysql-test/suite/innodb/t/ddl_purge.test
 share/mysql-test/suite/innodb/t/deadlock_detect.combinations
 share/mysql-test/suite/innodb/t/deadlock_detect.test
 share/mysql-test/suite/innodb/t/deadlock_victim_race.test
+share/mysql-test/suite/innodb/t/deadlock_wait_lock_race.opt
+share/mysql-test/suite/innodb/t/deadlock_wait_lock_race.test
+share/mysql-test/suite/innodb/t/deadlock_wait_thr_race.opt
+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
@ -9866,6 +9923,7 @@ 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_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
@ -10170,8 +10228,10 @@ share/mysql-test/suite/innodb_i_s/innodb_locks.result
 share/mysql-test/suite/innodb_i_s/innodb_locks.test
 share/mysql-test/suite/innodb_i_s/innodb_metrics.result
 share/mysql-test/suite/innodb_i_s/innodb_metrics.test
+share/mysql-test/suite/innodb_i_s/innodb_mutexes.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_columns.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_columns.test
+share/mysql-test/suite/innodb_i_s/innodb_sys_datafiles.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_fields.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_fields.test
 share/mysql-test/suite/innodb_i_s/innodb_sys_foreign.result
@ -10180,6 +10240,7 @@ share/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_foreign_cols.test
 share/mysql-test/suite/innodb_i_s/innodb_sys_indexes.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_indexes.test
+share/mysql-test/suite/innodb_i_s/innodb_sys_semaphore_waits.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_tables.result
 share/mysql-test/suite/innodb_i_s/innodb_sys_tables.test
 share/mysql-test/suite/innodb_i_s/innodb_sys_tablespaces.opt
@ -10782,6 +10843,8 @@ share/mysql-test/suite/mariabackup/incremental_encrypted.result
 share/mysql-test/suite/mariabackup/incremental_encrypted.test
 share/mysql-test/suite/mariabackup/incremental_newdb_while_backup.result
 share/mysql-test/suite/mariabackup/incremental_newdb_while_backup.test
+share/mysql-test/suite/mariabackup/incremental_page_compressed.result
+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
@ -12729,6 +12792,10 @@ share/mysql-test/suite/roles/revoke_all.result
 share/mysql-test/suite/roles/revoke_all.test
 share/mysql-test/suite/roles/role_case_sensitive-10744.result
 share/mysql-test/suite/roles/role_case_sensitive-10744.test
+share/mysql-test/suite/roles/role_grant_propagate.result
+share/mysql-test/suite/roles/role_grant_propagate.test
+share/mysql-test/suite/roles/roles_tables_priv-29465.result
+share/mysql-test/suite/roles/roles_tables_priv-29465.test
 share/mysql-test/suite/roles/rpl_definer.result
 share/mysql-test/suite/roles/rpl_definer.test
 share/mysql-test/suite/roles/rpl_grant_revoke_current_role-8638.result
@ -12921,6 +12988,8 @@ share/mysql-test/suite/rpl/include/rpl_trig004.test
 share/mysql-test/suite/rpl/include/rpl_truncate.test
 share/mysql-test/suite/rpl/include/rpl_truncate_helper.test
 share/mysql-test/suite/rpl/include/rpl_typeconv.inc
+share/mysql-test/suite/rpl/include/rpl_xa_empty_transaction.inc
+share/mysql-test/suite/rpl/include/rpl_xa_empty_transaction_test_case.inc
 share/mysql-test/suite/rpl/include/rpl_xa_mixed_engines.inc
 share/mysql-test/suite/rpl/include/sql_multisource.inc
 share/mysql-test/suite/rpl/include/sql_out_of_order_gtid.inc
@ -13307,7 +13376,9 @@ 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_min.result
 share/mysql-test/suite/rpl/r/rpl_row_img_eng_noblob.result
-share/mysql-test/suite/rpl/r/rpl_row_img_sequence.result
+share/mysql-test/suite/rpl/r/rpl_row_img_sequence_full.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
 share/mysql-test/suite/rpl/r/rpl_row_index_choice.result
 share/mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
@ -13502,6 +13573,7 @@ share/mysql-test/suite/rpl/r/rpl_view.result
 share/mysql-test/suite/rpl/r/rpl_view_debug.result
 share/mysql-test/suite/rpl/r/rpl_view_multi.result
 share/mysql-test/suite/rpl/r/rpl_xa.result
+share/mysql-test/suite/rpl/r/rpl_xa_empty_transaction.result
 share/mysql-test/suite/rpl/r/rpl_xa_gap_lock.result
 share/mysql-test/suite/rpl/r/rpl_xa_gtid_pos_auto_engine.result
 share/mysql-test/suite/rpl/r/rpl_xa_survive_disconnect.result
@ -14006,8 +14078,12 @@ 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_sequence.cnf
-share/mysql-test/suite/rpl/t/rpl_row_img_sequence.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_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
+share/mysql-test/suite/rpl/t/rpl_row_img_sequence_noblob.test
 share/mysql-test/suite/rpl/t/rpl_row_implicit_commit_binlog.test
 share/mysql-test/suite/rpl/t/rpl_row_index_choice.test
 share/mysql-test/suite/rpl/t/rpl_row_inexist_tbl.test
@ -14254,6 +14330,8 @@ share/mysql-test/suite/rpl/t/rpl_view_multi.test
 share/mysql-test/suite/rpl/t/rpl_xa-master.opt
 share/mysql-test/suite/rpl/t/rpl_xa.inc
 share/mysql-test/suite/rpl/t/rpl_xa.test
+share/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.cnf
+share/mysql-test/suite/rpl/t/rpl_xa_empty_transaction.test
 share/mysql-test/suite/rpl/t/rpl_xa_gap_lock-slave.opt
 share/mysql-test/suite/rpl/t/rpl_xa_gap_lock.test
 share/mysql-test/suite/rpl/t/rpl_xa_gtid_pos_auto_engine-master.opt
@ -16731,6 +16809,7 @@ share/mysql-test/suite/versioning/r/foreign.result
 share/mysql-test/suite/versioning/r/insert.result
 share/mysql-test/suite/versioning/r/insert2.result
 share/mysql-test/suite/versioning/r/load_data.result
+share/mysql-test/suite/versioning/r/misc.result
 share/mysql-test/suite/versioning/r/not_embedded.result
 share/mysql-test/suite/versioning/r/online.result
 share/mysql-test/suite/versioning/r/optimized.result
@ -16768,6 +16847,7 @@ share/mysql-test/suite/versioning/t/foreign.test
 share/mysql-test/suite/versioning/t/insert.test
 share/mysql-test/suite/versioning/t/insert2.test
 share/mysql-test/suite/versioning/t/load_data.test
+share/mysql-test/suite/versioning/t/misc.test
 share/mysql-test/suite/versioning/t/not_embedded.test
 share/mysql-test/suite/versioning/t/online.test
 share/mysql-test/suite/versioning/t/optimized.test