Download raw body.
UPDATE: mariadb-11.4.7
On Wed, Jul 09, 2025 at 09:42:50PM +0200, Rafael Sadowski wrote:
> Simple update ports mariadb-11.4.7. There are some security
> related fixes in 11.4.6.
>
> Changelog:
>
> https://mariadb.com/docs/release-notes/mariadb-community-server-release-notes/mariadb-11-4-series/mariadb-11-4-6-release-notes
> https://mariadb.com/docs/release-notes/mariadb-community-server-release-notes/mariadb-11-4-series/mariadb-11.4.7-release-notes
>
>
> Tested on amd64 so far.
>
> Cheers Rafael
Here is a better diff.
Some fixes to the patch updating.
Tested on aarch64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.154
diff -u -p -u -p -r1.154 Makefile
--- Makefile 6 Mar 2025 11:47:18 -0000 1.154
+++ Makefile 16 Jul 2025 02:35:13 -0000
@@ -4,18 +4,18 @@ COMMENT-main= multithreaded SQL database
COMMENT-server= multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
-VERSION= 11.4.5
+VERSION= 11.4.7
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
-REVISION-server= 0
EPOCH= 1
CATEGORIES= databases
SITES= https://dlm.mariadb.com/4047800/MariaDB/${DISTNAME}/source/ \
https://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ \
https://archive.mariadb.org/${DISTNAME}/source/
-DISTFILES.fmt= fmt-11.0.2.zip
-SITES.fmt= https://github.com/fmtlib/fmt/releases/download/11.0.2/
+FMT_V= 11.1.4
+DISTFILES.fmt= fmt-${FMT_V}.zip
+SITES.fmt= https://github.com/fmtlib/fmt/releases/download/${FMT_V}/
LIB_VERSION= 31
SHARED_LIBS= mysqlclient_r ${LIB_VERSION}.0 \
@@ -136,7 +136,7 @@ PKG_ARGS+= -Drocksdb=0
pre-configure:
mkdir -p ${WRKBUILD}/extra/libfmt/src
- cp -f ${DISTDIR}/fmt-11.0.2.zip ${WRKBUILD}/extra/libfmt/src
+ cp -f ${DISTDIR}/fmt-${FMT_V}.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
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/mariadb/distinfo,v
retrieving revision 1.63
diff -u -p -u -p -r1.63 distinfo
--- distinfo 9 Feb 2025 20:30:02 -0000 1.63
+++ distinfo 16 Jul 2025 02:35:13 -0000
@@ -1,4 +1,4 @@
-SHA256 (fmt-11.0.2.zip) = QPxYvrzzjHWeEae9j9wWNQfSQj71BYu6fyYoDFucVGU=
-SHA256 (mariadb-11.4.5.tar.gz) = /2WV+MSC+ZIeObl/oRIjd6afDcvZJVPGuQMsvw6bU1Q=
-SIZE (fmt-11.0.2.zip) = 1422604
-SIZE (mariadb-11.4.5.tar.gz) = 112382453
+SHA256 (fmt-11.1.4.zip) = SbA5YBGW4adl6BxcmgWmHtPTPyOzlhMj1zIuT+IT0+Y=
+SHA256 (mariadb-11.4.7.tar.gz) = vyBofKEvp+/ajficqx8qZhKIzqQaz49TGJtp1SlDR9A=
+SIZE (fmt-11.1.4.zip) = 1426493
+SIZE (mariadb-11.4.7.tar.gz) = 115980754
Index: patches/patch-include_my_cpu_h
===================================================================
RCS file: patches/patch-include_my_cpu_h
diff -N patches/patch-include_my_cpu_h
--- patches/patch-include_my_cpu_h 5 Mar 2025 21:34:51 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
-clang doesn't have __builtin_riscv_pause()
-Use raw instruction encoding like in src/sys CPU_BUSY_CYCLE(),
-no idea how to cleanly access the "pause" instruction from the
-Zihintpause extension.
-
-Index: include/my_cpu.h
---- include/my_cpu.h.orig
-+++ include/my_cpu.h
-@@ -97,7 +97,11 @@ static inline void MY_RELAX_CPU(void)
- /* Changed from __ppc_get_timebase for musl and clang compatibility */
- __builtin_ppc_get_timebase();
- #elif defined __GNUC__ && defined __riscv
-+# if defined(__clang__)
-+ __asm volatile(".long 0x0100000f" ::: "memory");
-+# else /* !clang */
- __builtin_riscv_pause();
-+# endif
- #elif defined __GNUC__
- /* Mainly, prevent the compiler from optimizing away delay loops */
- __asm__ __volatile__ ("":::"memory");
Index: patches/patch-libmariadb_libmariadb_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-libmariadb_libmariadb_CMakeLists_txt,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 patch-libmariadb_libmariadb_CMakeLists_txt
--- patches/patch-libmariadb_libmariadb_CMakeLists_txt 29 Nov 2024 11:31:48 -0000 1.19
+++ patches/patch-libmariadb_libmariadb_CMakeLists_txt 16 Jul 2025 02:35:13 -0000
@@ -1,7 +1,7 @@
Index: libmariadb/libmariadb/CMakeLists.txt
--- libmariadb/libmariadb/CMakeLists.txt.orig
+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -487,15 +487,6 @@ INCLUDE(${CC_SOURCE_DIR}/cmake/symlink.cmake)
+@@ -481,15 +481,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
Index: patches/patch-scripts_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-scripts_CMakeLists_txt,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 patch-scripts_CMakeLists_txt
--- patches/patch-scripts_CMakeLists_txt 11 Mar 2022 18:31:22 -0000 1.17
+++ patches/patch-scripts_CMakeLists_txt 16 Jul 2025 02:35:13 -0000
@@ -1,7 +1,7 @@
Index: scripts/CMakeLists.txt
--- scripts/CMakeLists.txt.orig
+++ scripts/CMakeLists.txt
-@@ -186,25 +186,14 @@ ENDIF(UNIX)
+@@ -185,25 +185,14 @@ ENDIF(UNIX)
# i.e. makes access relative the current directory. This matches
# the documentation, so better not change this.
Index: patches/patch-storage_connect_plgxml_h
===================================================================
RCS file: patches/patch-storage_connect_plgxml_h
diff -N patches/patch-storage_connect_plgxml_h
--- patches/patch-storage_connect_plgxml_h 8 May 2025 07:31:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-From b02ad4a6f8ea09c5cdf0a44a9ee57a60f2989f48 Mon Sep 17 00:00:00 2001
-From: Sergey Vojtovich <svojtovich@gmail.com>
-Date: Sat, 5 Apr 2025 21:06:41 +0400
-Subject: [PATCH] MDEV-36427 - FTBFS with libxml2 2.14.0
-
-Index: storage/connect/plgxml.h
---- storage/connect/plgxml.h.orig
-+++ storage/connect/plgxml.h
-@@ -5,7 +5,7 @@
- /******************************************************************/
- /* Dual XML implementation base classes defines. */
- /******************************************************************/
--#if !defined(BASE_BUFFER_SIZE)
-+#ifndef LIBXML2_SUPPORT
- enum ElementType { // libxml2
- XML_ELEMENT_NODE = 1,
- XML_ATTRIBUTE_NODE = 2,
-@@ -28,7 +28,7 @@ enum ElementType { // libxml2
- XML_XINCLUDE_START = 19,
- XML_XINCLUDE_END = 20,
- XML_DOCB_DOCUMENT_NODE = 21};
--#endif // !BASE_BUFFER_SIZE
-+#endif
-
- //#if !defined(NODE_TYPE_LIST)
- #ifdef NOT_USED
Index: patches/patch-storage_connect_tabxml_cpp
===================================================================
RCS file: patches/patch-storage_connect_tabxml_cpp
diff -N patches/patch-storage_connect_tabxml_cpp
--- patches/patch-storage_connect_tabxml_cpp 8 May 2025 07:31:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-From b02ad4a6f8ea09c5cdf0a44a9ee57a60f2989f48 Mon Sep 17 00:00:00 2001
-From: Sergey Vojtovich <svojtovich@gmail.com>
-Date: Sat, 5 Apr 2025 21:06:41 +0400
-Subject: [PATCH] MDEV-36427 - FTBFS with libxml2 2.14.0
-
-Index: storage/connect/tabxml.cpp
---- storage/connect/tabxml.cpp.orig
-+++ storage/connect/tabxml.cpp
-@@ -25,6 +25,9 @@
- #include <netinet/in.h>
- #include <unistd.h>
- //#include <ctype.h>
-+#ifdef LIBXML2_SUPPORT
-+#include <libxml/tree.h>
-+#endif
- #include "osutil.h"
- #define _O_RDONLY O_RDONLY
- #endif // !_WIN32
Index: patches/patch-storage_rocksdb_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-storage_rocksdb_CMakeLists_txt,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-storage_rocksdb_CMakeLists_txt
--- patches/patch-storage_rocksdb_CMakeLists_txt 9 Feb 2025 20:30:02 -0000 1.6
+++ patches/patch-storage_rocksdb_CMakeLists_txt 16 Jul 2025 02:35:13 -0000
@@ -1,3 +1,8 @@
+- MDEV-37001 Enable building RocksDB on non-Linux aarch64 OSes
+ fadfd9ea282078a00bd39dc3b0fa30e6fe72e19e
+- Rocksdb: Add missing getauxval() test for Linux
+ 6d684b64d57c94899126ceb2bedf1725e016dfaa
+
Index: storage/rocksdb/CMakeLists.txt
--- storage/rocksdb/CMakeLists.txt.orig
+++ storage/rocksdb/CMakeLists.txt
@@ -5,14 +10,14 @@ Index: storage/rocksdb/CMakeLists.txt
ADD_DEFINITIONS(-DHAVE_SCHED_GETCPU=1 -DROCKSDB_SCHED_GETCPU_PRESENT)
ENDIF()
-+CHECK_FUNCTION_EXISTS(getauxval "sys/auvx.h" HAVE_AUXV_GETAUXVAL)
++CHECK_FUNCTION_EXISTS(getauxval HAVE_AUXV_GETAUXVAL)
+if(HAVE_AUXV_GETAUXVAL)
-+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
++ ADD_DEFINITIONS(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
+endif()
+
-+CHECK_FUNCTION_EXISTS(elf_aux_info "sys/auxv.h" HAVE_AUXV_ELF_AUX_INFO)
++CHECK_FUNCTION_EXISTS(elf_aux_info HAVE_AUXV_ELF_AUX_INFO)
+if(HAVE_AUXV_ELF_AUX_INFO)
-+ add_definitions(-DROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
++ ADD_DEFINITIONS(-DROCKSDB_AUXV_ELF_AUX_INFO_PRESENT)
+endif()
+
IF(WITH_VALGRIND)
Index: patches/patch-storage_rocksdb_rocksdb_CMakeLists_txt
===================================================================
RCS file: patches/patch-storage_rocksdb_rocksdb_CMakeLists_txt
diff -N patches/patch-storage_rocksdb_rocksdb_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-storage_rocksdb_rocksdb_CMakeLists_txt 16 Jul 2025 02:35:13 -0000
@@ -0,0 +1,20 @@
+- 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/CMakeLists.txt
+--- storage/rocksdb/rocksdb/CMakeLists.txt.orig
++++ storage/rocksdb/rocksdb/CMakeLists.txt
+@@ -618,6 +618,11 @@ if(HAVE_AUXV_GETAUXVAL)
+ add_definitions(-DROCKSDB_AUXV_GETAUXVAL_PRESENT)
+ endif()
+
++check_cxx_symbol_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()
++
+ check_cxx_symbol_exists(F_FULLFSYNC "fcntl.h" HAVE_FULLFSYNC)
+ if(HAVE_FULLFSYNC)
+ add_definitions(-DHAVE_FULLFSYNC)
Index: patches/patch-storage_rocksdb_rocksdb_port_jemalloc_helper_h
===================================================================
RCS file: patches/patch-storage_rocksdb_rocksdb_port_jemalloc_helper_h
diff -N patches/patch-storage_rocksdb_rocksdb_port_jemalloc_helper_h
--- patches/patch-storage_rocksdb_rocksdb_port_jemalloc_helper_h 28 Oct 2022 17:15:11 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-jemalloc_helper: Limit the mm_malloc.h hack to glibc on linux
-https://github.com/facebook/rocksdb/commit/bac399449d0bc8127a2bfb97e78c1ab6356b201c
-
-https://jira.mariadb.org/browse/MDEV-29875
-
-Index: storage/rocksdb/rocksdb/port/jemalloc_helper.h
---- storage/rocksdb/rocksdb/port/jemalloc_helper.h.orig
-+++ storage/rocksdb/rocksdb/port/jemalloc_helper.h
-@@ -5,7 +5,7 @@
-
- #pragma once
-
--#if defined(__clang__)
-+#if defined(__clang__) && defined(__GLIBC__)
- // glibc's `posix_memalign()` declaration specifies `throw()` while clang's
- // declaration does not. There is a hack in clang to make its re-declaration
- // compatible with glibc's if they are declared consecutively. That hack breaks
Index: patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc
--- patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc 30 Sep 2024 04:36:54 -0000 1.2
+++ patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_cc 16 Jul 2025 02:35:13 -0000
@@ -1,11 +1,3 @@
-- 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 elf_aux_info() support for OpenBSD
https://github.com/facebook/rocksdb/pull/12967
@@ -14,171 +6,53 @@ https://jira.mariadb.org/browse/MDEV-298
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,21 @@
-
- #include "util/crc32c_arm64.h"
-
--#if defined(__linux__) && defined(HAVE_ARM64_CRC)
-+#if defined(HAVE_ARM64_CRC)
-
-+#if defined(__linux__)
+@@ -10,16 +10,16 @@
+ #if defined(__linux__)
#include <asm/hwcap.h>
-+#endif
+ #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
-+#endif
-
- #ifdef HAVE_ARM64_CRYPTO
- /* unfolding to compute 8 * 3 = 24 bytes parallelly */
-@@ -33,18 +41,52 @@
- } while (0)
+ #ifndef HWCAP_PMULL
+ #define HWCAP_PMULL (1 << 4)
#endif
+-#if defined(__APPLE__)
++#elif defined(__APPLE__)
+ #include <sys/sysctl.h>
+ #endif
+
+@@ -46,11 +46,12 @@
+ extern bool pmull_runtime_flag;
-+extern bool pmull_runtime_flag;
-+
uint32_t crc32c_runtime_check(void) {
-- uint64_t auxv = getauxval(AT_HWCAP);
+-#if !defined(__APPLE__)
+#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);
+ 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
+ elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));
+ #endif
return (auxv & HWCAP_CRC32) != 0;
-+#else
-+ return 0;
-+#endif
+@@ -63,11 +64,12 @@ uint32_t crc32c_runtime_check(void) {
}
--uint32_t crc32c_arm64(uint32_t crc, unsigned char const *data,
-- unsigned len) {
-+bool crc32c_pmull_runtime_check(void) {
+ bool crc32c_pmull_runtime_check(void) {
+-#if !defined(__APPLE__)
+#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);
+ 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;
-+#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 +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
-- 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);
+ elf_aux_info(AT_HWCAP, &auxv, sizeof(auxv));
#endif
-+ } // if Pmull runtime check here
-+
- buf8 = (const uint8_t *)buf64;
- while (length >= 8) {
- crc = crc32c_u64(crc, *(const uint64_t *)buf8);
+ return (auxv & HWCAP_PMULL) != 0;
Index: patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h
===================================================================
RCS file: patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h
diff -N patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h
--- patches/patch-storage_rocksdb_rocksdb_util_crc32c_arm64_h 9 Nov 2022 12:12:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-- 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
Index: patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-storage_rocksdb_rocksdb_util_crc32c_cc
--- patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc 30 Sep 2024 04:36:54 -0000 1.2
+++ patches/patch-storage_rocksdb_rocksdb_util_crc32c_cc 16 Jul 2025 02:35:13 -0000
@@ -1,9 +1,3 @@
-- 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
-- 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
@@ -12,76 +6,32 @@ https://jira.mariadb.org/browse/MDEV-298
Index: storage/rocksdb/rocksdb/util/crc32c.cc
--- storage/rocksdb/rocksdb/util/crc32c.cc.orig
+++ storage/rocksdb/rocksdb/util/crc32c.cc
-@@ -35,10 +35,20 @@
+@@ -42,10 +42,12 @@
#define AT_HWCAP2 26
#endif
+-#elif __FreeBSD__
+#elif __FreeBSD__ && ROCKSDB_AUXV_ELF_AUX_INFO_PRESENT
-+#include <machine/cpu.h>
-+#include <sys/auxv.h>
-+#include <sys/elf_common.h>
+ #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
-
-+#if defined(HAVE_ARM64_CRC)
-+bool pmull_runtime_flag = false;
-+#endif
-+
- namespace ROCKSDB_NAMESPACE {
- namespace crc32c {
-
-@@ -457,6 +467,18 @@ static int arch_ppc_probe(void) {
+@@ -476,12 +478,12 @@ static int arch_ppc_probe(void) {
return arch_ppc_crc32;
}
+-#elif __FreeBSD__
+#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
+ static int arch_ppc_probe(void) {
+ unsigned long cpufeatures;
+ arch_ppc_crc32 = 0;
--#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 +510,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 +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>;
--#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>;
+-#if defined(__powerpc64__)
++#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__ */
Index: patches/patch-support-files_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/databases/mariadb/patches/patch-support-files_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-support-files_CMakeLists_txt
--- patches/patch-support-files_CMakeLists_txt 30 Sep 2024 04:36:54 -0000 1.8
+++ patches/patch-support-files_CMakeLists_txt 16 Jul 2025 02:35:13 -0000
@@ -3,7 +3,7 @@ Adjust the pkg-config file path since th
Index: support-files/CMakeLists.txt
--- support-files/CMakeLists.txt.orig
+++ support-files/CMakeLists.txt
-@@ -109,7 +109,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
+@@ -108,7 +108,7 @@ IF(UNIX AND NOT WITHOUT_SERVER)
ENDIF()
CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-server,v
retrieving revision 1.56
diff -u -p -u -p -r1.56 PLIST-server
--- pkg/PLIST-server 9 Feb 2025 20:30:02 -0000 1.56
+++ pkg/PLIST-server 16 Jul 2025 02:35:13 -0000
@@ -276,6 +276,7 @@ include/mysql/server/private/my_tracker.
include/mysql/server/private/my_tree.h
include/mysql/server/private/my_uctype.h
include/mysql/server/private/my_user.h
+include/mysql/server/private/my_virtual_mem.h
include/mysql/server/private/myisam.h
include/mysql/server/private/myisamchk.h
include/mysql/server/private/myisammrg.h
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-tests,v
retrieving revision 1.68
diff -u -p -u -p -r1.68 PLIST-tests
--- pkg/PLIST-tests 9 Feb 2025 20:30:02 -0000 1.68
+++ pkg/PLIST-tests 16 Jul 2025 02:35:14 -0000
@@ -654,6 +654,9 @@ share/mysql-test/include/show_slave_host
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-cursor-pkg-01.inc
+share/mysql-test/include/sp-cursor-pkg-02.inc
+share/mysql-test/include/sp-cursor-pkg-03.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
@@ -1323,6 +1326,9 @@ share/mysql-test/main/ctype_utf8mb4_0900
share/mysql-test/main/ctype_utf8mb4_0900.test
share/mysql-test/main/ctype_utf8mb4_0900_ai_ci_casefold.result
share/mysql-test/main/ctype_utf8mb4_0900_ai_ci_casefold.test
+share/mysql-test/main/ctype_utf8mb4_0900_mem.opt
+share/mysql-test/main/ctype_utf8mb4_0900_mem.result
+share/mysql-test/main/ctype_utf8mb4_0900_mem.test
share/mysql-test/main/ctype_utf8mb4_general_ci_casefold.result
share/mysql-test/main/ctype_utf8mb4_general_ci_casefold.test
share/mysql-test/main/ctype_utf8mb4_general_ci_ws.result
@@ -1742,6 +1748,8 @@ share/mysql-test/main/greedy_optimizer.r
share/mysql-test/main/greedy_optimizer.test
share/mysql-test/main/group_by.result
share/mysql-test/main/group_by.test
+share/mysql-test/main/group_by_cardinality.result
+share/mysql-test/main/group_by_cardinality.test
share/mysql-test/main/group_by_innodb.result
share/mysql-test/main/group_by_innodb.test
share/mysql-test/main/group_by_null.result
@@ -2106,6 +2114,8 @@ share/mysql-test/main/lowercase_view.res
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/mariadb-upgrade-service.result
+share/mysql-test/main/mariadb-upgrade-service.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
@@ -2119,6 +2129,8 @@ share/mysql-test/main/mdev-31636.result
share/mysql-test/main/mdev-31636.test
share/mysql-test/main/mdev-35046.result
share/mysql-test/main/mdev-35046.test
+share/mysql-test/main/mdev-35721-ubsan.result
+share/mysql-test/main/mdev-35721-ubsan.test
share/mysql-test/main/mdev13607.result
share/mysql-test/main/mdev13607.test
share/mysql-test/main/mdev19198.result
@@ -2170,6 +2182,9 @@ share/mysql-test/main/multi_update_innod
share/mysql-test/main/multi_update_tiny_hash-master.opt
share/mysql-test/main/multi_update_tiny_hash.result
share/mysql-test/main/multi_update_tiny_hash.test
+share/mysql-test/main/my_getopt_case_insensitive.opt
+share/mysql-test/main/my_getopt_case_insensitive.result
+share/mysql-test/main/my_getopt_case_insensitive.test
share/mysql-test/main/my_print_defaults.result
share/mysql-test/main/my_print_defaults.test
share/mysql-test/main/myisam-big.result
@@ -3441,6 +3456,8 @@ share/mysql-test/main/type_timestamp_rou
share/mysql-test/main/type_timestamp_round.test
share/mysql-test/main/type_uint.result
share/mysql-test/main/type_uint.test
+share/mysql-test/main/type_varbinary.result
+share/mysql-test/main/type_varbinary.test
share/mysql-test/main/type_varchar.opt
share/mysql-test/main/type_varchar.result
share/mysql-test/main/type_varchar.test
@@ -4365,6 +4382,7 @@ share/mysql-test/plugin/spider/spider/bu
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_29605.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_29667.result
@@ -4421,6 +4439,9 @@ share/mysql-test/plugin/spider/spider/bu
share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35064.result
share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35326.result
share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35422.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35807.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35874.result
+share/mysql-test/plugin/spider/spider/bugfix/r/mdev_35959.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
@@ -4572,6 +4593,7 @@ share/mysql-test/plugin/spider/spider/bu
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_29605.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
@@ -4639,6 +4661,9 @@ share/mysql-test/plugin/spider/spider/bu
share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35064.test
share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35326.test
share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35422.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35807.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35874.test
+share/mysql-test/plugin/spider/spider/bugfix/t/mdev_35959.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
@@ -5721,13 +5746,16 @@ share/mysql-test/suite/atomic/alter_part
share/mysql-test/suite/atomic/alter_partition.combinations
share/mysql-test/suite/atomic/alter_partition.result
share/mysql-test/suite/atomic/alter_partition.test
-share/mysql-test/suite/atomic/alter_table.opt
-share/mysql-test/suite/atomic/alter_table.result
-share/mysql-test/suite/atomic/alter_table.test
+share/mysql-test/suite/atomic/alter_table.inc
share/mysql-test/suite/atomic/alter_table_aria.result
share/mysql-test/suite/atomic/alter_table_aria.test
share/mysql-test/suite/atomic/alter_table_big_query.result
share/mysql-test/suite/atomic/alter_table_big_query.test
+share/mysql-test/suite/atomic/alter_table_innodb.opt
+share/mysql-test/suite/atomic/alter_table_innodb.result
+share/mysql-test/suite/atomic/alter_table_innodb.test
+share/mysql-test/suite/atomic/alter_table_myisam.result
+share/mysql-test/suite/atomic/alter_table_myisam.test
share/mysql-test/suite/atomic/alter_table_rocksdb.result
share/mysql-test/suite/atomic/alter_table_rocksdb.test
share/mysql-test/suite/atomic/alter_table_trigger.result
@@ -5816,6 +5844,7 @@ share/mysql-test/suite/binlog/r/binlog_b
share/mysql-test/suite/binlog/r/binlog_checkpoint.result
share/mysql-test/suite/binlog/r/binlog_checkpoint_flush_logs.result
share/mysql-test/suite/binlog/r/binlog_checksum.result
+share/mysql-test/suite/binlog/r/binlog_commit_fail.result
share/mysql-test/suite/binlog/r/binlog_commit_wait.result
share/mysql-test/suite/binlog/r/binlog_database.result
share/mysql-test/suite/binlog/r/binlog_delete_and_flush_index.result
@@ -5972,6 +6001,7 @@ share/mysql-test/suite/binlog/t/binlog_b
share/mysql-test/suite/binlog/t/binlog_checkpoint.test
share/mysql-test/suite/binlog/t/binlog_checkpoint_flush_logs.test
share/mysql-test/suite/binlog/t/binlog_checksum.test
+share/mysql-test/suite/binlog/t/binlog_commit_fail.test
share/mysql-test/suite/binlog/t/binlog_commit_wait.test
share/mysql-test/suite/binlog/t/binlog_database.test
share/mysql-test/suite/binlog/t/binlog_delete_and_flush_index-master.opt
@@ -6471,6 +6501,9 @@ share/mysql-test/suite/compat/oracle/t/s
share/mysql-test/suite/compat/oracle/t/sp-cache-invalidate.inc
share/mysql-test/suite/compat/oracle/t/sp-code.test
share/mysql-test/suite/compat/oracle/t/sp-cursor-decl.test
+share/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-01.inc
+share/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-02.inc
+share/mysql-test/suite/compat/oracle/t/sp-cursor-pkg-03.inc
share/mysql-test/suite/compat/oracle/t/sp-cursor-rowtype.test
share/mysql-test/suite/compat/oracle/t/sp-cursor.test
share/mysql-test/suite/compat/oracle/t/sp-expr.test
@@ -8174,6 +8207,7 @@ share/mysql-test/suite/galera/include/ki
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/start_mysqld.inc
+share/mysql-test/suite/galera/include/wait_condition_with_debug_and_kill.inc
share/mysql-test/suite/galera/my.cnf
share/mysql-test/suite/galera/r/
share/mysql-test/suite/galera/r/GAL-382.result
@@ -8233,7 +8267,10 @@ share/mysql-test/suite/galera/r/MDEV-345
share/mysql-test/suite/galera/r/MDEV-34647.result
share/mysql-test/suite/galera/r/MDEV-35018.result
share/mysql-test/suite/galera/r/MDEV-35446.result
+share/mysql-test/suite/galera/r/MDEV-35748.result
share/mysql-test/suite/galera/r/MDEV-35852.result
+share/mysql-test/suite/galera/r/MDEV-35946.result
+share/mysql-test/suite/galera/r/MDEV-36116.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
@@ -8246,6 +8283,7 @@ share/mysql-test/suite/galera/r/MW-292.r
share/mysql-test/suite/galera/r/MW-309.result
share/mysql-test/suite/galera/r/MW-313.result
share/mysql-test/suite/galera/r/MW-329.result
+share/mysql-test/suite/galera/r/MW-329F.result
share/mysql-test/suite/galera/r/MW-336.result
share/mysql-test/suite/galera/r/MW-357.result
share/mysql-test/suite/galera/r/MW-369.result
@@ -8296,7 +8334,6 @@ share/mysql-test/suite/galera/r/galera_b
share/mysql-test/suite/galera/r/galera_bf_abort_for_update.result
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
@@ -8388,7 +8425,6 @@ share/mysql-test/suite/galera/r/galera_i
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
share/mysql-test/suite/galera/r/galera_ist_progress.result
share/mysql-test/suite/galera/r/galera_ist_recv_bind.result
@@ -8435,6 +8471,7 @@ share/mysql-test/suite/galera/r/galera_p
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_partitioned_tables.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
@@ -8465,7 +8502,10 @@ share/mysql-test/suite/galera/r/galera_s
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,binlogoff.rdiff
share/mysql-test/suite/galera/r/galera_sequences.result
+share/mysql-test/suite/galera/r/galera_sequences_bf_kill.result
+share/mysql-test/suite/galera/r/galera_sequences_transaction.result
share/mysql-test/suite/galera/r/galera_serializable.result
share/mysql-test/suite/galera/r/galera_server.result
share/mysql-test/suite/galera/r/galera_set_position_after_cert_failure.result
@@ -8477,6 +8517,7 @@ share/mysql-test/suite/galera/r/galera_s
share/mysql-test/suite/galera/r/galera_split_brain.result
share/mysql-test/suite/galera/r/galera_sql_log_bin_zero.result
share/mysql-test/suite/galera/r/galera_ssl.result
+share/mysql-test/suite/galera/r/galera_ssl_cipher.result
share/mysql-test/suite/galera/r/galera_ssl_compression.result
share/mysql-test/suite/galera/r/galera_ssl_upgrade.result
share/mysql-test/suite/galera/r/galera_sst_encrypted.result
@@ -8489,6 +8530,8 @@ share/mysql-test/suite/galera/r/galera_s
share/mysql-test/suite/galera/r/galera_sst_mariabackup_encrypt_with_key_server.result
share/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery,debug.rdiff
share/mysql-test/suite/galera/r/galera_sst_mariabackup_force_recovery.result
+share/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid,debug.rdiff
+share/mysql-test/suite/galera/r/galera_sst_mariabackup_gtid.result
share/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive,debug.rdiff
share/mysql-test/suite/galera/r/galera_sst_mariabackup_logarchive.result
share/mysql-test/suite/galera/r/galera_sst_mariabackup_lost_found.result
@@ -8496,10 +8539,8 @@ share/mysql-test/suite/galera/r/galera_s
share/mysql-test/suite/galera/r/galera_sst_mariabackup_table_options.result
share/mysql-test/suite/galera/r/galera_sst_mariabackup_use_memory.result
share/mysql-test/suite/galera/r/galera_sst_mysqldump,debug.rdiff
-share/mysql-test/suite/galera/r/galera_sst_mysqldump,release.rdiff
share/mysql-test/suite/galera/r/galera_sst_mysqldump.result
share/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,debug.rdiff
-share/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key,release.rdiff
share/mysql-test/suite/galera/r/galera_sst_mysqldump_with_key.result
share/mysql-test/suite/galera/r/galera_sst_rsync,debug.rdiff
share/mysql-test/suite/galera/r/galera_sst_rsync.result
@@ -8514,6 +8555,8 @@ share/mysql-test/suite/galera/r/galera_s
share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_key.result
share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_server,debug.rdiff
share/mysql-test/suite/galera/r/galera_sst_rsync_encrypt_with_server.result
+share/mysql-test/suite/galera/r/galera_sst_rsync_gtid,debug.rdiff
+share/mysql-test/suite/galera/r/galera_sst_rsync_gtid.result
share/mysql-test/suite/galera/r/galera_sst_rsync_logbasename.result
share/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto,debug.rdiff
share/mysql-test/suite/galera/r/galera_sst_rsync_recv_auto.result
@@ -8586,6 +8629,9 @@ share/mysql-test/suite/galera/r/galera_v
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_during_ist.result
+share/mysql-test/suite/galera/r/galera_vote_joined_apply.result
+share/mysql-test/suite/galera/r/galera_vote_joined_skip.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
@@ -8613,6 +8659,7 @@ share/mysql-test/suite/galera/r/mdev-220
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-29775.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
@@ -8629,7 +8676,6 @@ share/mysql-test/suite/galera/r/mysql-ws
share/mysql-test/suite/galera/r/mysql-wsrep#247.result
share/mysql-test/suite/galera/r/mysql-wsrep#31.result
share/mysql-test/suite/galera/r/mysql-wsrep#33,debug.rdiff
-share/mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff
share/mysql-test/suite/galera/r/mysql-wsrep#33.result
share/mysql-test/suite/galera/r/mysql-wsrep#332.result
share/mysql-test/suite/galera/r/mysql-wsrep#90.result
@@ -8719,12 +8765,17 @@ share/mysql-test/suite/galera/t/MDEV-335
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.cnf
share/mysql-test/suite/galera/t/MDEV-34647.test
share/mysql-test/suite/galera/t/MDEV-35018.test
share/mysql-test/suite/galera/t/MDEV-35446.cnf
share/mysql-test/suite/galera/t/MDEV-35446.test
+share/mysql-test/suite/galera/t/MDEV-35748.opt
+share/mysql-test/suite/galera/t/MDEV-35748.test
share/mysql-test/suite/galera/t/MDEV-35852.cnf
share/mysql-test/suite/galera/t/MDEV-35852.test
+share/mysql-test/suite/galera/t/MDEV-35946.test
+share/mysql-test/suite/galera/t/MDEV-36116.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
@@ -8741,6 +8792,8 @@ share/mysql-test/suite/galera/t/MW-313.c
share/mysql-test/suite/galera/t/MW-313.test
share/mysql-test/suite/galera/t/MW-329.cnf
share/mysql-test/suite/galera/t/MW-329.test
+share/mysql-test/suite/galera/t/MW-329F.cnf
+share/mysql-test/suite/galera/t/MW-329F.test
share/mysql-test/suite/galera/t/MW-336.cnf
share/mysql-test/suite/galera/t/MW-336.test
share/mysql-test/suite/galera/t/MW-357.test
@@ -8898,6 +8951,7 @@ share/mysql-test/suite/galera/t/galera_f
share/mysql-test/suite/galera/t/galera_fk_no_pk.test
share/mysql-test/suite/galera/t/galera_fk_selfreferential.test
share/mysql-test/suite/galera/t/galera_fk_setnull.test
+share/mysql-test/suite/galera/t/galera_fk_truncate.cnf
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
@@ -9013,6 +9067,7 @@ share/mysql-test/suite/galera/t/galera_p
share/mysql-test/suite/galera/t/galera_parallel_simple.test
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_partitioned_tables.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
@@ -9051,7 +9106,14 @@ share/mysql-test/suite/galera/t/galera_s
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.combinations
share/mysql-test/suite/galera/t/galera_sequences.test
+share/mysql-test/suite/galera/t/galera_sequences_bf_kill.cnf
+share/mysql-test/suite/galera/t/galera_sequences_bf_kill.combinations
+share/mysql-test/suite/galera/t/galera_sequences_bf_kill.test
+share/mysql-test/suite/galera/t/galera_sequences_transaction.cnf
+share/mysql-test/suite/galera/t/galera_sequences_transaction.combinations
+share/mysql-test/suite/galera/t/galera_sequences_transaction.test
share/mysql-test/suite/galera/t/galera_serializable.test
share/mysql-test/suite/galera/t/galera_server.test
share/mysql-test/suite/galera/t/galera_set_position_after_cert_failure.test
@@ -9067,6 +9129,8 @@ share/mysql-test/suite/galera/t/galera_s
share/mysql-test/suite/galera/t/galera_sql_log_bin_zero.test
share/mysql-test/suite/galera/t/galera_ssl.cnf
share/mysql-test/suite/galera/t/galera_ssl.test
+share/mysql-test/suite/galera/t/galera_ssl_cipher.cnf
+share/mysql-test/suite/galera/t/galera_ssl_cipher.test
share/mysql-test/suite/galera/t/galera_ssl_compression.cnf
share/mysql-test/suite/galera/t/galera_ssl_compression.test
share/mysql-test/suite/galera/t/galera_ssl_upgrade.cnf
@@ -9086,6 +9150,8 @@ share/mysql-test/suite/galera/t/galera_s
share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery-master.opt
share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery.cnf
share/mysql-test/suite/galera/t/galera_sst_mariabackup_force_recovery.test
+share/mysql-test/suite/galera/t/galera_sst_mariabackup_gtid.cnf
+share/mysql-test/suite/galera/t/galera_sst_mariabackup_gtid.test
share/mysql-test/suite/galera/t/galera_sst_mariabackup_logarchive.cnf
share/mysql-test/suite/galera/t/galera_sst_mariabackup_logarchive.test
share/mysql-test/suite/galera/t/galera_sst_mariabackup_lost_found.cnf
@@ -9114,6 +9180,8 @@ share/mysql-test/suite/galera/t/galera_s
share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_key.test
share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.cnf
share/mysql-test/suite/galera/t/galera_sst_rsync_encrypt_with_server.test
+share/mysql-test/suite/galera/t/galera_sst_rsync_gtid.cnf
+share/mysql-test/suite/galera/t/galera_sst_rsync_gtid.test
share/mysql-test/suite/galera/t/galera_sst_rsync_logbasename.cnf
share/mysql-test/suite/galera/t/galera_sst_rsync_logbasename.test
share/mysql-test/suite/galera/t/galera_sst_rsync_recv_auto.cnf
@@ -9207,6 +9275,14 @@ share/mysql-test/suite/galera/t/galera_v
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_during_ist.cnf
+share/mysql-test/suite/galera/t/galera_vote_during_ist.test
+share/mysql-test/suite/galera/t/galera_vote_joined_apply.cnf
+share/mysql-test/suite/galera/t/galera_vote_joined_apply.test
+share/mysql-test/suite/galera/t/galera_vote_joined_begin.inc
+share/mysql-test/suite/galera/t/galera_vote_joined_end.inc
+share/mysql-test/suite/galera/t/galera_vote_joined_skip.cnf
+share/mysql-test/suite/galera/t/galera_vote_joined_skip.test
share/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.cnf
share/mysql-test/suite/galera/t/galera_vote_rejoin_ddl.test
share/mysql-test/suite/galera/t/galera_vote_rejoin_dml.cnf
@@ -9240,6 +9316,7 @@ share/mysql-test/suite/galera/t/mdev-220
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-29775.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
@@ -9294,6 +9371,8 @@ share/mysql-test/suite/galera_3nodes/r/G
share/mysql-test/suite/galera_3nodes/r/GCF-363.result
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/MDEV-36360.result
+share/mysql-test/suite/galera_3nodes/r/galera-features#115.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
@@ -9320,6 +9399,7 @@ share/mysql-test/suite/galera_3nodes/r/g
share/mysql-test/suite/galera_3nodes/r/galera_pc_weight.result
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_sst_donor_non_prim.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
@@ -9339,8 +9419,12 @@ share/mysql-test/suite/galera_3nodes/t/G
share/mysql-test/suite/galera_3nodes/t/GCF-376.test
share/mysql-test/suite/galera_3nodes/t/MDEV-29171.cnf
share/mysql-test/suite/galera_3nodes/t/MDEV-29171.test
+share/mysql-test/suite/galera_3nodes/t/MDEV-36360.test
+share/mysql-test/suite/galera_3nodes/t/galera-features#115.cnf
+share/mysql-test/suite/galera_3nodes/t/galera-features#115.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.combinations
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
@@ -9382,6 +9466,8 @@ share/mysql-test/suite/galera_3nodes/t/g
share/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test
share/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.cnf
share/mysql-test/suite/galera_3nodes/t/galera_ssl_reload.test
+share/mysql-test/suite/galera_3nodes/t/galera_sst_donor_non_prim.cnf
+share/mysql-test/suite/galera_3nodes/t/galera_sst_donor_non_prim.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
@@ -9478,6 +9564,7 @@ share/mysql-test/suite/galera_sr/r/MDEV-
share/mysql-test/suite/galera_sr/r/MDEV-34836.result
share/mysql-test/suite/galera_sr/r/MDEV-35281.result
share/mysql-test/suite/galera_sr/r/MENT-2038.result
+share/mysql-test/suite/galera_sr/r/MENT-2042.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
@@ -9587,6 +9674,7 @@ share/mysql-test/suite/galera_sr/t/MDEV-
share/mysql-test/suite/galera_sr/t/MDEV-34836.test
share/mysql-test/suite/galera_sr/t/MDEV-35281.test
share/mysql-test/suite/galera_sr/t/MENT-2038.test
+share/mysql-test/suite/galera_sr/t/MENT-2042.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
@@ -9919,7 +10007,6 @@ share/mysql-test/suite/innodb/r/blob-cra
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/bulk_load.result
share/mysql-test/suite/innodb/r/cascade_lock_wait.result
share/mysql-test/suite/innodb/r/change_column_collation.result
@@ -10101,9 +10188,7 @@ share/mysql-test/suite/innodb/r/innodb_b
share/mysql-test/suite/innodb/r/innodb_buffer_pool_fail.result
share/mysql-test/suite/innodb/r/innodb_buffer_pool_load_now.result
share/mysql-test/suite/innodb/r/innodb_buffer_pool_resize.result
-share/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_bigtest.result
share/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_temporary.result
-share/mysql-test/suite/innodb/r/innodb_buffer_pool_resize_with_chunks.result
share/mysql-test/suite/innodb/r/innodb_bug11754376.result
share/mysql-test/suite/innodb/r/innodb_bug12400341.result
share/mysql-test/suite/innodb/r/innodb_bug12661768.result
@@ -10290,6 +10375,7 @@ share/mysql-test/suite/innodb/r/max_reco
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/mem_pressure,32bit.rdiff
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
@@ -10317,11 +10403,6 @@ share/mysql-test/suite/innodb/r/records_
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.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
@@ -10339,6 +10420,8 @@ share/mysql-test/suite/innodb/r/stat_tab
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_defragment.result
+share/mysql-test/suite/innodb/r/sys_defragment_fail.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
@@ -10444,8 +10527,6 @@ share/mysql-test/suite/innodb/t/blob-cra
share/mysql-test/suite/innodb/t/blob-update-debug.test
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/bulk_load.opt
share/mysql-test/suite/innodb/t/bulk_load.test
share/mysql-test/suite/innodb/t/cascade_lock_wait.test
@@ -10651,17 +10732,14 @@ share/mysql-test/suite/innodb/t/innodb_2
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero-master.opt
share/mysql-test/suite/innodb/t/innodb_autoinc_lock_mode_zero.test
share/mysql-test/suite/innodb/t/innodb_buffer_pool_dump_pct.test
+share/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.opt
share/mysql-test/suite/innodb/t/innodb_buffer_pool_fail.test
share/mysql-test/suite/innodb/t/innodb_buffer_pool_load_now.opt
share/mysql-test/suite/innodb/t/innodb_buffer_pool_load_now.test
share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize.opt
share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize.test
-share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.opt
-share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_bigtest.test
-share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_debug.opt
+share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.opt
share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_temporary.test
-share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.opt
-share/mysql-test/suite/innodb/t/innodb_buffer_pool_resize_with_chunks.test
share/mysql-test/suite/innodb/t/innodb_bug11754376.test
share/mysql-test/suite/innodb/t/innodb_bug12400341.test
share/mysql-test/suite/innodb/t/innodb_bug12661768.test
@@ -10855,6 +10933,7 @@ share/mysql-test/suite/innodb/t/max_reco
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/mem_pressure.opt
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
@@ -10887,7 +10966,6 @@ share/mysql-test/suite/innodb/t/recovery
share/mysql-test/suite/innodb/t/recovery_shutdown.test
share/mysql-test/suite/innodb/t/rename_table.opt
share/mysql-test/suite/innodb/t/rename_table.test
-share/mysql-test/suite/innodb/t/restart.opt
share/mysql-test/suite/innodb/t/restart.test
share/mysql-test/suite/innodb/t/row_format_redundant.opt
share/mysql-test/suite/innodb/t/row_format_redundant.test
@@ -10907,6 +10985,10 @@ share/mysql-test/suite/innodb/t/stat_tab
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_defragment.opt
+share/mysql-test/suite/innodb/t/sys_defragment.test
+share/mysql-test/suite/innodb/t/sys_defragment_fail.opt
+share/mysql-test/suite/innodb/t/sys_defragment_fail.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
@@ -10935,6 +11017,7 @@ share/mysql-test/suite/innodb/t/temp_tru
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.opt
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
@@ -10965,7 +11048,6 @@ share/mysql-test/suite/innodb/t/undo_upg
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
@@ -11944,6 +12026,8 @@ share/mysql-test/suite/mariabackup/parti
share/mysql-test/suite/mariabackup/partial_exclude.test
share/mysql-test/suite/mariabackup/partition_datadir.result
share/mysql-test/suite/mariabackup/partition_datadir.test
+share/mysql-test/suite/mariabackup/partition_notwin.result
+share/mysql-test/suite/mariabackup/partition_notwin.test
share/mysql-test/suite/mariabackup/partition_partial.opt
share/mysql-test/suite/mariabackup/partition_partial.result
share/mysql-test/suite/mariabackup/partition_partial.test
@@ -12083,6 +12167,9 @@ share/mysql-test/suite/multi_source/info
share/mysql-test/suite/multi_source/info_logs.test
share/mysql-test/suite/multi_source/load_data.result
share/mysql-test/suite/multi_source/load_data.test
+share/mysql-test/suite/multi_source/master_info_file.opt
+share/mysql-test/suite/multi_source/master_info_file.result
+share/mysql-test/suite/multi_source/master_info_file.test
share/mysql-test/suite/multi_source/mdev-8874.cnf
share/mysql-test/suite/multi_source/mdev-8874.result
share/mysql-test/suite/multi_source/mdev-8874.test
@@ -12107,6 +12194,9 @@ share/mysql-test/suite/multi_source/repl
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/show_slave_auth_info.cnf
+share/mysql-test/suite/multi_source/show_slave_auth_info.result
+share/mysql-test/suite/multi_source/show_slave_auth_info.test
share/mysql-test/suite/multi_source/simple.result
share/mysql-test/suite/multi_source/simple.test
share/mysql-test/suite/multi_source/skip_counter.result
@@ -14180,6 +14270,7 @@ share/mysql-test/suite/rpl/r/rpl_create_
share/mysql-test/suite/rpl/r/rpl_create_drop_view.result
share/mysql-test/suite/rpl/r/rpl_create_if_not_exists.result
share/mysql-test/suite/rpl/r/rpl_create_or_replace_fail.result
+share/mysql-test/suite/rpl/r/rpl_create_select_row.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
@@ -14557,6 +14648,7 @@ share/mysql-test/suite/rpl/r/rpl_semi_sy
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_disable_with_slave.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
@@ -14564,6 +14656,7 @@ share/mysql-test/suite/rpl/r/rpl_semi_sy
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_ssl_stop.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
share/mysql-test/suite/rpl/r/rpl_semisync_ali_issues.result
@@ -14704,6 +14797,7 @@ share/mysql-test/suite/rpl/r/rpl_view.re
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_2pc_multi_engine.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
@@ -14850,6 +14944,7 @@ share/mysql-test/suite/rpl/t/rpl_create_
share/mysql-test/suite/rpl/t/rpl_create_drop_view.test
share/mysql-test/suite/rpl/t/rpl_create_if_not_exists.test
share/mysql-test/suite/rpl/t/rpl_create_or_replace_fail.test
+share/mysql-test/suite/rpl/t/rpl_create_select_row.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
@@ -15334,6 +15429,7 @@ share/mysql-test/suite/rpl/t/rpl_semi_sy
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_disable_with_slave.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
@@ -15345,6 +15441,7 @@ share/mysql-test/suite/rpl/t/rpl_semi_sy
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_ssl_stop.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
share/mysql-test/suite/rpl/t/rpl_semi_sync_wait_point.opt
@@ -15529,6 +15626,7 @@ share/mysql-test/suite/rpl/t/rpl_view_mu
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_2pc_multi_engine.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
@@ -15606,6 +15704,7 @@ share/mysql-test/suite/s3/suite.pm
share/mysql-test/suite/s3/unsupported.result
share/mysql-test/suite/s3/unsupported.test
share/mysql-test/suite/sql_sequence/
+share/mysql-test/suite/sql_sequence/alter.opt
share/mysql-test/suite/sql_sequence/alter.result
share/mysql-test/suite/sql_sequence/alter.test
share/mysql-test/suite/sql_sequence/alter_notembedded.result
@@ -16750,7 +16849,6 @@ share/mysql-test/suite/sys_vars/r/wsrep_
share/mysql-test/suite/sys_vars/r/wsrep_desync_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_dirty_reads_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_drupal_282555_workaround_basic.result
-share/mysql-test/suite/sys_vars/r/wsrep_forced_binlog_format_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_gtid_domain_id_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_gtid_mode_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_load_data_splitting_basic.result
@@ -16764,6 +16862,7 @@ share/mysql-test/suite/sys_vars/r/wsrep_
share/mysql-test/suite/sys_vars/r/wsrep_on_without_provider.result
share/mysql-test/suite/sys_vars/r/wsrep_osu_method_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_recover_basic.result
+share/mysql-test/suite/sys_vars/r/wsrep_replicate_myisam_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_restart_slave_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_retry_autocommit_basic.result
share/mysql-test/suite/sys_vars/r/wsrep_slave_fk_checks_basic.result
@@ -17001,7 +17100,7 @@ share/mysql-test/suite/sys_vars/t/innodb
share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_load_at_startup_basic.test
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.opt
share/mysql-test/suite/sys_vars/t/innodb_buffer_pool_size_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
@@ -17605,7 +17704,6 @@ share/mysql-test/suite/sys_vars/t/wsrep_
share/mysql-test/suite/sys_vars/t/wsrep_desync_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_dirty_reads_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_drupal_282555_workaround_basic.test
-share/mysql-test/suite/sys_vars/t/wsrep_forced_binlog_format_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_gtid_domain_id_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_gtid_mode_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_load_data_splitting_basic.test
@@ -17619,6 +17717,7 @@ share/mysql-test/suite/sys_vars/t/wsrep_
share/mysql-test/suite/sys_vars/t/wsrep_on_without_provider.test
share/mysql-test/suite/sys_vars/t/wsrep_osu_method_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_recover_basic.test
+share/mysql-test/suite/sys_vars/t/wsrep_replicate_myisam_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_restart_slave_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_retry_autocommit_basic.test
share/mysql-test/suite/sys_vars/t/wsrep_slave_fk_checks_basic.test
@@ -18072,9 +18171,13 @@ share/mysql-test/suite/wsrep/r/pool_of_t
share/mysql-test/suite/wsrep/r/trans.result
share/mysql-test/suite/wsrep/r/variables.result
share/mysql-test/suite/wsrep/r/variables_debug.result
+share/mysql-test/suite/wsrep/r/wsrep-recover-gtid-nobinlog.result
+share/mysql-test/suite/wsrep/r/wsrep-recover-gtid.result
share/mysql-test/suite/wsrep/r/wsrep-recover-v25,binlogon.rdiff
share/mysql-test/suite/wsrep/r/wsrep-recover-v25.result
share/mysql-test/suite/wsrep/r/wsrep-recover.result
+share/mysql-test/suite/wsrep/r/wsrep_forced_binlog_format.result
+share/mysql-test/suite/wsrep/r/wsrep_mixed_case_cmd_arg.result
share/mysql-test/suite/wsrep/r/wsrep_on_basic.result
share/mysql-test/suite/wsrep/r/wsrep_protocol_versions.result
share/mysql-test/suite/wsrep/r/wsrep_provider_plugin.result
@@ -18119,6 +18222,10 @@ share/mysql-test/suite/wsrep/t/variables
share/mysql-test/suite/wsrep/t/variables.test
share/mysql-test/suite/wsrep/t/variables_debug.cnf
share/mysql-test/suite/wsrep/t/variables_debug.test
+share/mysql-test/suite/wsrep/t/wsrep-recover-gtid-nobinlog.cnf
+share/mysql-test/suite/wsrep/t/wsrep-recover-gtid-nobinlog.test
+share/mysql-test/suite/wsrep/t/wsrep-recover-gtid.cnf
+share/mysql-test/suite/wsrep/t/wsrep-recover-gtid.test
share/mysql-test/suite/wsrep/t/wsrep-recover-step.inc
share/mysql-test/suite/wsrep/t/wsrep-recover-v25.cnf
share/mysql-test/suite/wsrep/t/wsrep-recover-v25.combinations
@@ -18126,6 +18233,11 @@ share/mysql-test/suite/wsrep/t/wsrep-rec
share/mysql-test/suite/wsrep/t/wsrep-recover.cnf
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_forced_binlog_format.cnf
+share/mysql-test/suite/wsrep/t/wsrep_forced_binlog_format.test
+share/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.cnf
+share/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.opt
+share/mysql-test/suite/wsrep/t/wsrep_mixed_case_cmd_arg.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_protocol_versions.cnf
UPDATE: mariadb-11.4.7