Merge branch '11.8' into 12.0

.github/workflows/windows-arm64.yml

@@ -0,0 +1,51 @@
+name: Build on Windows ARM64
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'bb-*'
+      - '[0-9]+.[0-9]+'
+      - '*wlad*'
+  pull_request:
+
+jobs:
+  build:
+    concurrency:
+      group: ${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: true
+
+    runs-on: windows-11-arm
+
+    steps:
+      - name: Configure git
+        run: |
+          # We won't be able to successfully run mtr
+          # unless we configure autocrlf.
+          git config --global core.autocrlf input
+
+      - uses: actions/checkout@v4
+
+      - name: Install prerequisites
+        run: |
+          # Install bison to compile
+          choco install winflexbison3
+
+      - name: Build
+        run: |
+          # speedup checkout by excluding uninteresting modules
+          git config submodule.storage/columnstore/columnstore.update none
+          git config submodule.storage/maria/libmarias3.update none
+          git config submodule.storage/rocksdb/rocksdb.update none
+          git config submodule.wsrep-lib.update none
+          mkdir bld
+          cd bld
+          cmake .. -DWITH_SSL=bundled
+          cmake --build . --config RelWithDebinfo --verbose -- -m
+
+      - name: Test MTR
+        run: |
+          $env:PATH = "C:\Strawberry\perl\bin;$env:PATH;C:\Program Files (x86)\Windows Kits\10\Debuggers\arm64"
+          #Calculate parallel as 4 * number of processors
+          $parallel = 4 * [int]$env:NUMBER_OF_PROCESSORS
+          perl bld\mysql-test\mysql-test-run.pl --force --parallel=$parallel --suite=main  --mysqld=--loose-innodb-flush-log-at-trx-commit=2

.gitignore

@@ -138,6 +138,7 @@ scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/mytop
+scripts/print_ddl_recovery_log.pl
 scripts/wsrep_sst_backup
 scripts/wsrep_sst_common
 scripts/wsrep_sst_mysqldump

CMakeLists.txt

@@ -120,15 +120,7 @@ ENDIF()
 FIND_PACKAGE(Git)
 
 IF(WIN32 AND (CMAKE_VERSION VERSION_GREATER "3.21"))
- # Install runtime dependency by default, when using vcpkg
+ OPTION(INSTALL_RUNTIME_DEPENDENCIES "Install runtime dependencies" ON)
- IF(NOT DEFINED INSTALL_RUNTIME_DEPENDENCIES_DEFAULT)
-   IF("${VCPKG_INSTALLED_DIR}")
-     SET(INSTALL_RUNTIME_DEPENDENCIES_DEFAULT OFF)
-   ELSE()
-     SET(INSTALL_RUNTIME_DEPENDENCIES_DEFAULT ON)
-   ENDIF()
- ENDIF()
- OPTION(INSTALL_RUNTIME_DEPENDENCIES "Install runtime dependencies"  "${INSTALL_RUNTIME_DEPENDENCIES_DEFAULT}")
 ENDIF()
 
 # Following autotools tradition, add preprocessor definitions
@@ -299,7 +291,7 @@ ENDIF()
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 
-IF(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
   # Enable extra checks when using a recent enough version of GNU libstdc++
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -D_GLIBCXX_ASSERTIONS")
 ENDIF()
@@ -597,6 +589,7 @@ IF(WITH_SBOM)
   GENERATE_SBOM()
 ENDIF()
 
+INSTALL_RUNTIME_DEPS()
 INCLUDE(CPack)
 
 IF(WIN32 AND SIGNCODE)

CODING_STANDARDS.md

@@ -187,7 +187,7 @@ C file names use the `.c` extension, C++ files use the `.cc` extension and heade
 
 ### Language standards
 
-For pure-C files we use C99 and for C++ we use C++11.
+For pure-C files we use C99 (starting with 10.4.25) and for C++ we use C++11 (starting with 11.8.1).
 The code need to be able to compile on multiple platforms using different compilers (for example: Windows / Linux, x86_64 / ARM).
 
 ### Line lengths

client/mysqlcheck.c

@@ -899,6 +899,9 @@ static int disable_binlog()
 }
 
 
+/* Ok as mysqlcheck is not multi threaded */
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 static int handle_request_for_tables(char *tables, size_t length,
                                      my_bool view, my_bool dont_quote)
 {
@@ -1030,9 +1033,6 @@ static void insert_table_name(DYNAMIC_ARRAY *arr, char *in, size_t dblen)
   insert_dynamic(arr, (uchar*) buf);
 }
 
-/* Ok as mysqlcheck is not multi threaded */
-PRAGMA_DISABLE_CHECK_STACK_FRAME
-
 static void __attribute__((noinline)) print_result()
 {
   MYSQL_RES *res;

client/mysqlslap.c

@@ -419,6 +419,8 @@ int main(int argc, char **argv)
   return 0;
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
 {
   unsigned int x;
@@ -514,6 +516,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
   my_free(head_sptr);
 
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 
 static struct my_option my_long_options[] =
@@ -2283,6 +2286,7 @@ statement_cleanup(statement *stmt)
   }
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
 
 int 
 slap_connect(MYSQL *mysql)
@@ -2316,3 +2320,4 @@ slap_connect(MYSQL *mysql)
 
   return 0;
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME

client/mysqltest.cc

@@ -2864,6 +2864,7 @@ do_result_format_version(struct st_command *command)
   dynstr_append_mem(&ds_res, ds_version.str, ds_version.length);
   dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
   dynstr_free(&ds_version);
+  DBUG_VOID_RETURN;
 }
 
 

cmake/build_configurations/mysql_release.cmake

@@ -173,7 +173,7 @@ ENDIF()
 IF(UNIX)  
 
   # Default GCC flags
-  IF(CMAKE_COMPILER_IS_GNUCC)
+  IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing  -Wno-uninitialized")
     STRING(APPEND CMAKE_C_FLAGS_DEBUG          " ${COMMON_C_FLAGS}")
     STRING(APPEND CMAKE_C_FLAGS_RELEASE        " ${COMMON_C_FLAGS}")
@@ -182,7 +182,7 @@ IF(UNIX)
     STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
     STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   ENDIF()
-  IF(CMAKE_COMPILER_IS_GNUCXX)
+  IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
     STRING(APPEND CMAKE_CXX_FLAGS_DEBUG          " ${COMMON_CXX_FLAGS}")
     STRING(APPEND CMAKE_CXX_FLAGS_RELEASE        " ${COMMON_CXX_FLAGS}")
@@ -202,11 +202,11 @@ IF(UNIX)
       SET(z_flags "")
     ENDIF()
 
-    IF(CMAKE_COMPILER_IS_GNUCC)
+    IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
       STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${z_flags}")
       STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${z_flags}")
     ENDIF()
-    IF(CMAKE_COMPILER_IS_GNUCXX)
+    IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${z_flags}")
       STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${z_flags}")
     ENDIF()

cmake/dtrace.cmake

@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA 
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
   AND CMAKE_SIZEOF_VOID_P EQUAL 4)
   IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
     EXECUTE_PROCESS(

cmake/install_macros.cmake

@@ -228,26 +228,58 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
     IF(SIGNCODE)
       SIGN_TARGET(${target} ${COMP})
     ENDIF()
+    IF(INSTALL_RUNTIME_DEPENDENCIES)
+      # Populate INSTALLED_TARGETS list (stored as global property)
+      # The list is used in INSTALL_RUNTIME_DEPS
+      GET_PROPERTY(installed_targets GLOBAL PROPERTY INSTALLED_TARGETS)
+      IF(NOT installed_targets)
+        SET(installed_targets)
+      ENDIF()
+      LIST(APPEND installed_targets "${target}")
+      SET_PROPERTY(GLOBAL PROPERTY INSTALLED_TARGETS "${installed_targets}")
+      SET(RUNTIME_DEPS RUNTIME_DEPENDENCY_SET ${target})
+    ENDIF()
+    INSTALL(TARGETS ${target} DESTINATION ${ARG_DESTINATION} ${COMP} ${RUNTIME_DEPS})
+    INSTALL_DEBUG_SYMBOLS(${target} ${COMP} INSTALL_LOCATION ${ARG_DESTINATION})
   ENDFOREACH()
+ENDFUNCTION()
 
-  IF(WIN32 AND INSTALL_RUNTIME_DEPENDENCIES)
+
-    STRING(JOIN "." runtime_deps_set_name ${TARGETS})
+# On Windows, installs runtime dependency for all targets
-    SET(RUNTIME_DEPS RUNTIME_DEPENDENCY_SET "${runtime_deps_set_name}")
+FUNCTION(INSTALL_RUNTIME_DEPS)
+  IF(NOT WIN32 OR NOT INSTALL_RUNTIME_DEPENDENCIES)
+    RETURN()
   ENDIF()
+  # Install all runtime dependencies
 
-  INSTALL(TARGETS ${TARGETS} DESTINATION ${ARG_DESTINATION} ${COMP} ${RUNTIME_DEPS})
+  GET_PROPERTY(installed_targets GLOBAL PROPERTY INSTALLED_TARGETS)
-  INSTALL_DEBUG_SYMBOLS(${TARGETS} ${COMP} INSTALL_LOCATION ${ARG_DESTINATION})
+  # Exclude all dependencies that are shared libraries from the
+  # same build.
+  FOREACH(tgt ${installed_targets})
+    SET(exclude_libs)
+    GET_TARGET_PROPERTY(link_libraries ${tgt} LINK_LIBRARIES)
+    IF(link_libraries)
+      FOREACH(lib ${link_libraries})
+        IF(TARGET ${lib})
+          GET_TARGET_PROPERTY(type ${lib} TYPE)
+          IF(type MATCHES "SHARED")
+            LIST(APPEND exclude_libs "$<TARGET_FILE_BASE_NAME:${lib}>\\.dll")
+          ENDIF()
+        ENDIF()
+      ENDFOREACH()
+    ENDIF()
 
-  IF(WIN32 AND INSTALL_RUNTIME_DEPENDENCIES)
     INSTALL(
       RUNTIME_DEPENDENCY_SET
-      "${runtime_deps_set_name}"
+      ${tgt}
       COMPONENT RuntimeDeps
       DESTINATION ${INSTALL_BINDIR}
       PRE_EXCLUDE_REGEXES
       "api-ms-" # Windows stuff
       "ext-ms-"
-      "server\\.dll" # main server DLL, installed separately
+      "icuuc\\.dll" # Old Windows 10 (1809)
+      "icuin\\.dll"
+      ${exclude_libs}
       "clang_rt" # ASAN libraries
       "vcruntime"
       POST_EXCLUDE_REGEXES
@@ -257,7 +289,7 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
       ${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin
       $<$<CONFIG:Debug>:${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin>
     )
-  ENDIF()
+  ENDFOREACH()
 ENDFUNCTION()
 
 # Optionally install mysqld/client/embedded from debug build run. outside of the current build dir

cmake/maintainer.cmake

@@ -42,6 +42,10 @@ SET(MY_WARNING_FLAGS
   -Wcast-function-type-strict
   )
 
+IF(NOT (WITH_MSAN OR WITH_ASAN OR WITH_UBSAN))
+  SET(MY_WARNING_FLAGS ${MY_WARNING_FLAGS} -Wframe-larger-than=16384)
+ENDIF()
+
 # Warning flags that are in testing before moving
 # to MY_WARNING_FLAGS if stable.
 SET(MY_WARNING_FLAGS_NON_FATAL
@@ -58,7 +62,7 @@ ENDFOREACH()
 
 SET(MY_ERROR_FLAGS -Werror -fno-operator-names -Wsuggest-override)
 
-IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized)
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=non-virtual-dtor) # gcc bug 7302
 ENDIF()

cmake/os/SunOS.cmake

@@ -69,8 +69,8 @@ CHECK_C_SOURCE_RUNS(
 
 
 # Check is special processor flag needs to be set on older GCC
-#that defaults to v8 sparc . Code here is taken from my_rdtsc.h
+# that defaults to v8 sparc . Code here is taken from my_rdtsc.h
-IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SIZEOF_VOID_P EQUAL 4
   AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
   SET(SOURCE
   "

cmake/os/Windows.cmake

@@ -174,10 +174,9 @@ if(MSVC)
       -Wno-unused-local-typedef
       -Wno-microsoft-static-assert
       -Wno-c++17-extensions
-      -msse4.2
     )
     if((CMAKE_SIZEOF_VOID_P MATCHES 8) AND MSVC_INTEL)
-      add_compile_options(-mpclmul)
+      add_compile_options(-mpclmul -msse4.2)
     endif()
   endif()
 

extra/CMakeLists.txt

@@ -82,6 +82,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
       )
 
 
+  # clang ~16+ with return values being undefined is resolved by basic optimization
+  # compiler flags for the function mach_read_from_2 (per MDEV-36316)
+  IF(WITH_MSAN AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+      SET_SOURCE_FILES_PROPERTIES(
+          ${INNOBASE_SOURCES}
+          innochecksum.cc
+          PROPERTIES COMPILE_FLAGS -Og)
+  ENDIF()
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
   ADD_DEPENDENCIES(innochecksum GenError)

extra/mariabackup/aria_backup_client.cc

@@ -955,6 +955,7 @@ void Backup::set_post_copy_table_hook(const post_copy_table_hook_t &hook) {
 
 bool prepare(const char *target_dir) {
 	maria_data_root= (char *)target_dir;
+        maria_tmpdir= &mysql_tmpdir_list;
 
 	if (maria_init())
 		die("Can't init Aria engine (%d)", errno);

extra/mariabackup/fil_cur.cc

@@ -209,7 +209,10 @@ xb_fil_cur_open(
 	cursor->buf_size = XB_FIL_CUR_PAGES * cursor->page_size;
 	cursor->buf = static_cast<byte*>(aligned_malloc(cursor->buf_size,
 							srv_page_size));
-
+	cursor->tmp_page = static_cast<byte*>(aligned_malloc(srv_page_size,
+							     srv_page_size));
+	cursor->tmp_frame = static_cast<byte*>(aligned_malloc(srv_page_size,
+							      srv_page_size));
 	cursor->buf_read = 0;
 	cursor->buf_npages = 0;
 	cursor->buf_offset = 0;
@@ -237,15 +240,10 @@ xb_fil_cur_open(
 	return(XB_FIL_CUR_SUCCESS);
 }
 
-/* Stack usage 131224 with clang */
-PRAGMA_DISABLE_CHECK_STACK_FRAME
-
 static bool page_is_corrupted(const byte *page, ulint page_no,
 			      const xb_fil_cur_t *cursor,
 			      const fil_space_t *space)
 {
-	byte tmp_frame[UNIV_PAGE_SIZE_MAX];
-	byte tmp_page[UNIV_PAGE_SIZE_MAX];
 	const ulint page_size = cursor->page_size;
 	uint16_t page_type = fil_page_get_type(page);
 
@@ -308,42 +306,43 @@ static bool page_is_corrupted(const byte *page, ulint page_no,
 		    && !opt_extended_validation)
 			return false;
 
-		memcpy(tmp_page, page, page_size);
+		memcpy(cursor->tmp_page, page, page_size);
 
 		if (!space->crypt_data
 		    || space->crypt_data->type == CRYPT_SCHEME_UNENCRYPTED
-		    || !fil_space_decrypt(space, tmp_frame, tmp_page)) {
+		    || !fil_space_decrypt(space, cursor->tmp_frame,
+					  cursor->tmp_page)) {
 			return true;
 		}
 
 		if (page_type != FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
-			return buf_page_is_corrupted(false, tmp_page,
+			return buf_page_is_corrupted(false, cursor->tmp_page,
 						     space->flags);
 		}
 	}
 
 	if (page_type == FIL_PAGE_PAGE_COMPRESSED) {
-		memcpy(tmp_page, page, page_size);
+		memcpy(cursor->tmp_page, page, page_size);
 	}
 
 	if (page_type == FIL_PAGE_PAGE_COMPRESSED
 	    || page_type == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED) {
-		ulint decomp = fil_page_decompress(tmp_frame, tmp_page,
+		ulint decomp = fil_page_decompress(cursor->tmp_frame,
+						   cursor->tmp_page,
 						   space->flags);
-		page_type = fil_page_get_type(tmp_page);
+		page_type = fil_page_get_type(cursor->tmp_page);
 
 		return (!decomp
 			|| (decomp != srv_page_size
 			    && cursor->zip_size)
 			|| page_type == FIL_PAGE_PAGE_COMPRESSED
 			|| page_type == FIL_PAGE_PAGE_COMPRESSED_ENCRYPTED
-			|| buf_page_is_corrupted(false, tmp_page,
+			|| buf_page_is_corrupted(false, cursor->tmp_page,
 						 space->flags));
 	}
 
 	return buf_page_is_corrupted(false, page, space->flags);
 }
-PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 /** Reads and verifies the next block of pages from the source
 file. Positions the cursor after the last read non-corrupted page.
@@ -507,7 +506,11 @@ xb_fil_cur_close(
 	xb_fil_cur_t *cursor)	/*!< in/out: source file cursor */
 {
 	aligned_free(cursor->buf);
+	aligned_free(cursor->tmp_page);
+	aligned_free(cursor->tmp_frame);
 	cursor->buf = NULL;
+	cursor->tmp_page = NULL;
+	cursor->tmp_frame = NULL;
 
 	if (cursor->node != NULL) {
 		xb_fil_node_close_file(cursor->node);

extra/mariabackup/fil_cur.h

@@ -46,7 +46,9 @@ struct xb_fil_cur_t {
 	xb_read_filt_t*	read_filter;	/*!< read filter */
 	xb_read_filt_ctxt_t	read_filter_ctxt;
 					/*!< read filter context */
-	byte*		buf;		/*!< read buffer */
+	byte*		buf;		/*!< read buffer of XB_FIL_CUR_PAGES */
+	byte*		tmp_page;	/*!< buffer for decrypting a page */
+	byte*		tmp_frame;	/*!< buffer for decompressing a page */
 	size_t		buf_size;	/*!< buffer size in bytes */
 	size_t		buf_read;	/*!< number of read bytes in buffer
 					after the last cursor read */

extra/mariabackup/xtrabackup.cc

@@ -1186,6 +1186,7 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 	const byte* name, ulint len,
 	const byte* new_name, ulint new_len)
 {
+        const char *error= "";
 	bool fail = false;
 	const std::string spacename{filename_to_spacename(name, len)};
 	switch (type) {
@@ -1193,6 +1194,7 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		msg("DDL tracking : create %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
 		fail = !check_if_skip_table(spacename.c_str());
+                error= "create";
 		break;
 	case FILE_MODIFY:
 		break;
@@ -1202,12 +1204,14 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 		fail = !check_if_skip_table(spacename.c_str())
 		       || !check_if_skip_table(
 				filename_to_spacename(new_name, new_len).c_str());
+                error= "rename";
 		break;
 	case FILE_DELETE:
 		fail = !check_if_skip_table(spacename.c_str())
 			&& !check_if_fts_table(spacename.c_str());
 		msg("DDL tracking : delete %" PRIu32 " \"%.*s\"",
 			space_id, int(len), name);
+                error= "delete";
 		break;
 	default:
 		ut_ad(0);
@@ -1215,9 +1219,14 @@ static void backup_file_op_fail(uint32_t space_id, int type,
 	}
 
 	if (fail) {
-		ut_a(opt_no_lock);
+          if (opt_no_lock)
-		die("DDL operation detected in the late phase of backup."
+            die("DDL operation detected in the late phase of backup while "
-			"Backup is inconsistent. Remove --no-lock option to fix.");
+                "executing %s on %s. "
+                "Backup is inconsistent. Remove --no-lock option to fix.",
+                error, name);
+          die("Unexpected DDL operation detected in the late phase of backup "
+              "while executing %s on %s. Backup is inconsistent.",
+              error, name);
 	}
 }
 

extra/wolfssl/CMakeLists.txt

@@ -130,7 +130,8 @@ endif()
 # Silence some warnings
 if(MSVC)
   # truncation warnings
-  target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:/wd4244>)
+  target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:/wd4244 /wd5287 /wd5286>)
+  target_compile_definitions(wolfssl PUBLIC WC_NO_STATIC_ASSERT)
   if(CMAKE_C_COMPILER_ID MATCHES Clang)
     target_compile_options(wolfssl PRIVATE $<$<COMPILE_LANGUAGE:C>:-Wno-incompatible-function-pointer-types>)
   endif()

include/my_attribute.h

@@ -83,17 +83,30 @@
 
 /* Define pragmas to disable warnings for stack frame checking */
 
-#if defined(__clang__)
+#ifdef __GNUC__
 #define PRAGMA_DISABLE_CHECK_STACK_FRAME                     \
-_Pragma("clang diagnostic push")                             \
+_Pragma("GCC diagnostic push")                               \
-_Pragma("clang diagnostic ignored \"-Wframe-larger-than=\"")
+_Pragma("GCC diagnostic ignored \"-Wframe-larger-than=\"")
 
 #define PRAGMA_REENABLE_CHECK_STACK_FRAME                    \
-_Pragma("clang diagnostic pop")
+_Pragma("GCC diagnostic pop")
 
+/*
+  The following check is for older gcc version that allocates
+  a lot of stack during startup that does not need to be checked
+*/
+
+#if !defined(__clang__) && __GNUC__ < 13
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA PRAGMA_DISABLE_CHECK_STACK_FRAME
 #else
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA
+#endif /* !defined(__clang__) && __GNUC__ < 13 */
+
+#else /*! __GNUC__ */
 #define PRAGMA_DISABLE_CHECK_STACK_FRAME
 #define PRAGMA_REENABLE_CHECK_STACK_FRAME
-#endif
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA
+#endif /* __GNUC__ */
 
 #endif /* _my_attribute_h */

include/my_pthread.h

@@ -645,7 +645,17 @@ extern void my_mutex_end(void);
   We need to have at least 256K stack to handle calls to myisamchk_init()
   with the current number of keys and key parts.
 */
-# if defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN)
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if defined(__clang__) && __has_feature(memory_sanitizer) && !defined(DBUG_OFF)
+/*
+  MSAN in Debug with clang-20.1 required more memory to complete
+  mtr begin/end checks. The result without increase was MSAN
+  errors triggered on a call instruction.
+*/
+#  define DEFAULT_THREAD_STACK	(2L<<20)
+# elif defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN)
 /*
   Optimized WITH_ASAN=ON executables produced
   by GCC 12.3.0, GCC 13.2.0, or clang 16.0.6

include/my_time.h

@@ -248,7 +248,6 @@ static inline longlong sec_part_unshift(longlong second_part, uint digits)
 /* Date/time rounding and truncation functions */
 static inline long my_time_fraction_remainder(long nr, uint decimals)
 {
-  DBUG_ASSERT(decimals <= TIME_SECOND_PART_DIGITS);
   return nr % (long) log_10_int[TIME_SECOND_PART_DIGITS - decimals];
 }
 static inline void my_datetime_trunc(MYSQL_TIME *ltime, uint decimals)

man/comp_err.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBCOMP_ERR\fR" "1" "4 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBCOMP_ERR\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -247,7 +247,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/galera_new_cluster.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBGALERA_NEW_CLUSTER\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBGALERA_NEW_CLUSTER\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/galera_recovery.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBGALERA_RECOVERY\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBGALERA_RECOVERY\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/innochecksum.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBINNOCHECKSUM\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBINNOCHECKSUM\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -303,7 +303,7 @@ Displays version information and exits\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-access.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-ACCESS\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-ACCESS\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -415,7 +415,7 @@ error will occur when you run
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-admin.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-ADMIN\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-ADMIN\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1522,7 +1522,7 @@ The maximum number of seconds to wait for server shutdown\&. The default value i
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-backup.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIABACKUP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIABACKUP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mariadb-binlog.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-BINLOG\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-BINLOG\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -2128,7 +2128,7 @@ option can be used to prevent this header from being written\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-check.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-CHECK\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-CHECK\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1143,7 +1143,7 @@ when these statements should not be sent to replication slaves or run when using
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-client-test.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-CLIENT-TEST\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-CLIENT-TEST\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -318,7 +318,7 @@ mariadb\-test/var\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2024 MariaDB Foundation
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-conv.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-CONV\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-CONV\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -90,7 +90,7 @@ Treat the specified characters as delimiters\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2024 MariaDB Foundation
+Copyright 2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-convert-table-format.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-CONVERT-TABLE-FORMAT\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-CONVERT-TABLE-FORMAT\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -208,7 +208,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-dump.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-DUMP\fR" "1" "8 October 2024" "MariaDB 11.6" "MariaDB Database System"
+.TH "\fBMARIADB-DUMP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -2906,7 +2906,7 @@ If you encounter problems backing up views, please read the section that covers
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-dumpslow.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-DUMPSLOW\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-DUMPSLOW\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -318,7 +318,7 @@ Count: 3  Time=2\&.13s (6s)  Lock=0\&.00s (0s)  Rows=0\&.0 (0), root[root]@local
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-find-rows.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-FIND-ROWS\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-FIND-ROWS\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -144,7 +144,7 @@ Start output from this row\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-fix-extensions.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-FIX-EXTENSIONS\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-FIX-EXTENSIONS\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -56,7 +56,7 @@ shell> \fBmariadb-fix-extensions \fR\fB\fIdata_dir\fR\fR
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-hotcopy.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-HOTCOPY\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-HOTCOPY\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -520,7 +520,7 @@ shell> \fBperldoc mariadb-hotcopy\fR
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-install-db.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-INSTALL-DB\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-INSTALL-DB\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -384,7 +384,7 @@ For internal use\&. This option is used for creating Windows distributions\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-plugin.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-PLUGIN\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-PLUGIN\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -361,7 +361,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved., 2013-2024 MariaDB Foundation
+Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved., 2013-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-secure-installation.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-SECURE-INSTALLATION\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-SECURE-INSTALLATION\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -153,7 +153,7 @@ Other unrecognized options will be passed on to the server\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-service-convert.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-SERVICE-CONVERT\fR" "1" "3 September 2024" "MariaDB 10.11" "MariaDB Database System"
+.TH "\fBMARIADB-SERVICE-CONVERT\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mariadb-setpermission.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-SETPERMISSION\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-SETPERMISSION\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -154,7 +154,7 @@ The MariaDB user name to use when connecting to the server\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-show.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-SHOW\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-SHOW\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -705,7 +705,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-slap.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-SLAP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-SLAP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1151,7 +1151,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-test.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-TEST\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-TEST\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1069,7 +1069,7 @@ statement is wrapped inside a view\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2024 MariaDB Foundation
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-tzinfo-to-sql.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-TZINFO-TO-SQL\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-TZINFO-TO-SQL\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -109,7 +109,7 @@ After running
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-upgrade.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-UPGRADE\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-UPGRADE\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -714,7 +714,7 @@ runs\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb-waitpid.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-WAITPID\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-WAITPID\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -113,7 +113,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -3115,7 +3115,7 @@ option\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadb_config.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB-CONFIG\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB-CONFIG\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -233,7 +233,7 @@ this way, be sure to invoke it within backtick (\(lq`\(rq) characters\&. That te
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadbd-multi.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADBD-MULTI\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADBD-MULTI\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -668,7 +668,7 @@ user       = jani
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadbd-safe-helper.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADBD-SAFE-HELPER\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADBD-SAFE-HELPER\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mariadbd-safe.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADBD-SAFE\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADBD-SAFE\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -857,7 +857,7 @@ file in the data directory\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mariadbd.8

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADBD\fR" "8" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADBD\fR" "8" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@ the MariaDB Knowledge Base\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mbstream.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMBSTREAM\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMBSTREAM\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/msql2mysql.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMSQL2MYSQL\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMSQL2MYSQL\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -53,7 +53,7 @@ utility to make the function name substitutions\&. See
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/my_print_defaults.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMY_PRINT_DEFAULTS\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMY_PRINT_DEFAULTS\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -219,7 +219,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/my_safe_process.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMY_SAFE_PROCESS\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMY_SAFE_PROCESS\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/myisam_ftdump.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMYISAM_FTDUMP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMYISAM_FTDUMP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -235,7 +235,7 @@ Verbose mode\&. Print more output about what the program does\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/myisamchk.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMYISAMCHK\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMYISAMCHK\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -2505,7 +2505,7 @@ instead of
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/myisamlog.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMYISAMLOG\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMYISAMLOG\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -218,7 +218,7 @@ Display version information\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/myisampack.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMYISAMPACK\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMYISAMPACK\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -823,7 +823,7 @@ option to
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mysql-stress-test.pl.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB\-STRESS\-TEST\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB\-STRESS\-TEST\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -482,7 +482,7 @@ Verbose mode\&. Print more information about what the program does\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2024 MariaDB Foundation
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mysql-test-run.pl.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMARIADB\-TEST\-RUN\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMARIADB\-TEST\-RUN\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -2304,7 +2304,7 @@ Search the server log for errors or warning after each test and report any suspi
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2024 MariaDB Foundation
+Copyright \(co 2007, 2010, Oracle and/or its affiliates, 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mysql.server.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBMYSQL\&.SERVER\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBMYSQL\&.SERVER\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -166,7 +166,7 @@ The login user name to use for running
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/mytop.1

@@ -1,4 +1,4 @@
-.TH MYTOP "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH MYTOP "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .SH NAME
 mytop \- display MariaDB server performance info like 'top'
 .SH "SEE ALSO"

man/perror.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBPERROR\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBPERROR\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -143,7 +143,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/replace.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBREPLACE\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBREPLACE\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -153,7 +153,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/resolve_stack_dump.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBRESOLVE_STACK_DUMP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBRESOLVE_STACK_DUMP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/resolveip.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBRESOLVEIP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBRESOLVEIP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -92,7 +92,7 @@ Display version information and exit\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2024 MariaDB Foundation
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2025 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP

man/wsrep_sst_backup.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\FBWSREP_SST_BACKUP\FR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\FBWSREP_SST_BACKUP\FR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/wsrep_sst_common.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBWSREP_SST_COMMON\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBWSREP_SST_COMMON\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/wsrep_sst_mariabackup.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBWSREP_SST_MARIABACKUP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBWSREP_SST_MARIABACKUP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/wsrep_sst_mysqldump.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBWSREP_SST_MYSQLDUMP\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBWSREP_SST_MYSQLDUMP\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/wsrep_sst_rsync.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBWSREP_SST_RSYNC\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBWSREP_SST_RSYNC\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/wsrep_sst_rsync_wan.1

@@ -1,6 +1,6 @@
 '\" t
 .\"
-.TH "\fBWSREP_SST_RSYNC_WAN\fR" "1" "3 September 2024" "MariaDB 11.4" "MariaDB Database System"
+.TH "\fBWSREP_SST_RSYNC_WAN\fR" "1" "5 March 2025" "MariaDB 11.8" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

mysql-test/include/have_crypt.inc

@@ -1,5 +1,3 @@
-# MDEV-27964 The function ENCRYPT() causes SIGSEGV in WITH_MSAN builds
--- source include/not_msan.inc
 # encrypt('a') is NULL if crypt(3) is not available
 # encrypt('a') is "*0" in fips mode
 if (`select length(encrypt('a')) > 3 IS NOT TRUE`) {

mysql-test/include/no_msan_without_big.inc

@@ -0,0 +1,8 @@
+# Slow with MSAN, but if mtr --big-test specified, then it should complete
+if (!$BIG_TEST)
+{
+  if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+  {
+    --skip Can't be run WITH_MSAN unless using --big-test
+  }
+}

mysql-test/include/not_msan.inc

@@ -1,4 +1,5 @@
-# This file should only be used with tests that are too big or slow for MSAN.
+# This file should only be used with tests that are too big or slow for MSAN (even with --big-test).
+# Use no_msan_without_big instead unless this really won't complete in a test timeout period.
 
 if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
 {

mysql-test/include/not_msan_with_debug.inc

@@ -0,0 +1,9 @@
+# This file should only be used with tests that are too big or slow for MSAN with Debug.
+
+if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+{
+  if (`select version() like '%debug%'`)
+  {
+    --skip Can't be run WITH_MSAN and CMAKE_BUILD_TYPE=Debug
+  }
+}

mysql-test/main/aborted_clients.result

@@ -1,4 +1,4 @@
-FLUSH STATUS;
+FLUSH GLOBAL STATUS;
 connect  con1,localhost,root,,;
 disconnect con1;
 connection default;

mysql-test/main/aborted_clients.test

@@ -5,7 +5,7 @@
 -- source include/not_embedded.inc
 -- source include/count_sessions.inc
 
-FLUSH STATUS;
+FLUSH GLOBAL STATUS;
 # Connect/Disconnect look that aborted_clients stays 0
 connect (con1,localhost,root,,);
 disconnect con1;

mysql-test/main/alter_table_lock.test

@@ -1,4 +1,3 @@
---source include/not_msan.inc
 --source include/not_embedded.inc
 --source include/have_innodb.inc
 

mysql-test/main/analyze.result

@@ -453,5 +453,56 @@ SELECT * FROM t1 WHERE f LIKE '2023%';
 f
 DROP TABLE t1;
 #
+# MDEV-36536 Add option to not collect statistics for long char/varchars
+#
+select  @@session.analyze_max_length;
+@@session.analyze_max_length
+4294967295
+create table t1 (c0 char(2), c1 char(16), c2 char(64), v1 varchar(16), v2 varchar(1000), b1 blob, i1 int)
+character set utf8mb4 COLLATE utf8mb4_bin;
+insert into t1 values ("A", "A","A","A","A","A",1), ("B","B","B","B","B","B",1);
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'b1'
+test.t1	analyze	status	OK
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c1
+c2
+i1
+v1
+v2
+set @@session.analyze_max_length= 64;
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'c2'
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'v2'
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'b1'
+test.t1	analyze	status	Table is already up to date
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c1
+i1
+v1
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT for COLUMNS (c0,c2,v1,v2,i1) INDEXES ALL;
+Table	Op	Msg_type	Msg_text
+test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	status	Table is already up to date
+select column_name from mysql.column_stats where table_name = 't1';
+column_name
+c0
+c2
+i1
+v1
+v2
+set @@session.analyze_max_length= default;
+drop table t1;
+#
 # End of 10.6 tests
 #

mysql-test/main/analyze.test

@@ -306,6 +306,26 @@ ANALYZE TABLE t1 PERSISTENT FOR ALL;
 SELECT * FROM t1 WHERE f LIKE '2023%';
 DROP TABLE t1;
 
+--echo #
+--echo # MDEV-36536 Add option to not collect statistics for long char/varchars
+--echo #
+
+select  @@session.analyze_max_length;
+create table t1 (c0 char(2), c1 char(16), c2 char(64), v1 varchar(16), v2 varchar(1000), b1 blob, i1 int)
+character set utf8mb4 COLLATE utf8mb4_bin;
+insert into t1 values ("A", "A","A","A","A","A",1), ("B","B","B","B","B","B",1);
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+set @@session.analyze_max_length= 64;
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT FOR ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+truncate table mysql.column_stats;
+ANALYZE TABLE t1 PERSISTENT for COLUMNS (c0,c2,v1,v2,i1) INDEXES ALL;
+select column_name from mysql.column_stats where table_name = 't1';
+set @@session.analyze_max_length= default;
+drop table t1;
+
 --echo #
 --echo # End of 10.6 tests
 --echo #

mysql-test/main/backup_lock.result

@@ -266,6 +266,7 @@ col1
 SET AUTOCOMMIT = 0;
 UPDATE t_permanent_innodb SET col1 = 9;
 UPDATE t_permanent_aria SET col1 = 9;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 UPDATE t_permanent_myisam SET col1 = 9;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 UPDATE t_permanent_aria2 SET col1 = 9;

mysql-test/main/backup_lock.test

@@ -328,6 +328,7 @@ select * from t_permanent_aria2;
 
 SET AUTOCOMMIT = 0;
 UPDATE t_permanent_innodb SET col1 = 9;
+--error ER_LOCK_WAIT_TIMEOUT
 UPDATE t_permanent_aria SET col1 = 9;
 --error ER_LOCK_WAIT_TIMEOUT
 UPDATE t_permanent_myisam SET col1 = 9;

mysql-test/main/charset_client_win_utf8mb4.test

@@ -1,5 +1,11 @@
 --source include/windows.inc
 --source include/check_utf8_cli.inc
+
+if(!`select $MTR_PARALLEL = 1`)
+{
+  skip race condition with parallel tests;
+}
+
 --exec $MYSQL --default-character-set=auto -e "select @@character_set_client"
 
 # Test that a user with old, non-UTF8 password can still connect

mysql-test/main/check_constraint.result

@@ -139,7 +139,7 @@ drop table t1;
 create or replace table t1( c1 int auto_increment primary key, check( c1 > 0 or c1 is null ) );
 ERROR HY000: Function or expression 'AUTO_INCREMENT' cannot be used in the CHECK clause of `c1`
 create table t1 (a int check (@b in (select user from mysql.user)));
-ERROR HY000: Function or expression 'select ...' cannot be used in the CHECK clause of `a`
+ERROR 42000: CHECK does not support subqueries or stored functions
 create table t1 (a int check (a > @b));
 ERROR HY000: Function or expression '@b' cannot be used in the CHECK clause of `a`
 create table t1 (a int check (a = 1));

mysql-test/main/check_constraint.test

@@ -87,7 +87,7 @@ create or replace table t1( c1 int auto_increment primary key, check( c1 > 0 or
 #
 # MDEV-12421 Check constraint with query crashes server and renders DB unusable
 #
---error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
+--error ER_SUBQUERIES_NOT_SUPPORTED
 create table t1 (a int check (@b in (select user from mysql.user)));
 --error ER_GENERATED_COLUMN_FUNCTION_IS_NOT_ALLOWED
 create table t1 (a int check (a > @b));

mysql-test/main/cte_recursive.test

@@ -1,6 +1,6 @@
 --source include/default_optimizer_switch.inc
 # This is too slow on MSAN
---source include/not_msan.inc
+--source include/no_msan_without_big.inc
 --source include/not_valgrind.inc
 --source include/have_innodb.inc
 

mysql-test/main/delete_multi_order_by.result

@@ -391,3 +391,37 @@ id	v
 select * from t3;
 id	v
 drop table t1, t2, t3;
+#
+# Begin 11.8 tests
+#
+#
+# MDEV-36997 Assertion failed in ha_tina::delete_row on multi delete
+#
+SET sql_mode='';
+CREATE TABLE t1 (v INT (1) NOT NULL) ENGINE=CSV;
+INSERT INTO t1 SELECT 1 away;
+SELECT COUNT(*) from t1;
+COUNT(*)
+1
+DELETE FROM a3,a1 USING t1 AS a1 JOIN t1 AS a2 JOIN t1 AS a3;
+SELECT COUNT(*) from t1;
+COUNT(*)
+0
+DROP TABLE t1;
+SET sql_mode='';
+CREATE TABLE t1 (v VECTOR (1) NOT NULL) ENGINE=CSV;
+INSERT INTO t1 SELECT 1 away;
+Warnings:
+Warning	4078	Cannot cast 'int' as 'vector' in assignment of `test`.`t1`.`v`
+Warning	1292	Incorrect vector value: '1' for column `test`.`t1`.`v` at row 1
+SELECT COUNT(*) from t1;
+COUNT(*)
+1
+DELETE FROM a3,a1 USING t1 AS a1 JOIN t1 AS a2 JOIN t1 AS a3;
+SELECT COUNT(*) from t1;
+COUNT(*)
+0
+DROP TABLE t1;
+#
+# End 11.8 tests
+#

mysql-test/main/delete_multi_order_by.test

@@ -3,6 +3,7 @@
 #
 
 --source include/have_innodb.inc
+--source include/have_csv.inc
 
 create table t1 (id int primary key, v int);
 create table t2 (id int primary key, v int);
@@ -203,3 +204,30 @@ select * from t2;
 select * from t3;
 
 drop table t1, t2, t3;
+
+--echo #
+--echo # Begin 11.8 tests
+--echo #
+
+--echo #
+--echo # MDEV-36997 Assertion failed in ha_tina::delete_row on multi delete
+--echo #
+SET sql_mode='';
+CREATE TABLE t1 (v INT (1) NOT NULL) ENGINE=CSV;
+INSERT INTO t1 SELECT 1 away;
+SELECT COUNT(*) from t1;
+DELETE FROM a3,a1 USING t1 AS a1 JOIN t1 AS a2 JOIN t1 AS a3;
+SELECT COUNT(*) from t1;
+DROP TABLE t1;
+
+SET sql_mode='';
+CREATE TABLE t1 (v VECTOR (1) NOT NULL) ENGINE=CSV;
+INSERT INTO t1 SELECT 1 away;
+SELECT COUNT(*) from t1;
+DELETE FROM a3,a1 USING t1 AS a1 JOIN t1 AS a2 JOIN t1 AS a3;
+SELECT COUNT(*) from t1;
+DROP TABLE t1;
+
+--echo #
+--echo # End 11.8 tests
+--echo #

mysql-test/main/derived.result

@@ -1384,6 +1384,152 @@ drop table t1,t2,t3;
 # End of 10.3 tests
 #
 #
+# MDEV-24588: Fix crash with unnamed column in derived table.
+# Assertion `item->name.str && item->name.str[0]` in
+# `TABLE_LIST::create_field_translation` fails when a SELECT
+# query includes a derived table containing unnamed column
+# (eg: `SELECT '' from t`).
+#
+# Tests from the bug report
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+SELECT SHA(pk) IN (SELECT * FROM (SELECT '' FROM t) AS a) FROM t;
+SHA(pk) IN (SELECT * FROM (SELECT '' FROM t) AS a)
+0
+0
+0
+SET sql_mode='';
+PREPARE p FROM 'SELECT SHA(pk) IN (SELECT * FROM (SELECT \'\' FROM t) AS a) FROM t;';
+EXECUTE p;
+SHA(pk) IN (SELECT * FROM (SELECT '' FROM t) AS a)
+0
+0
+0
+EXECUTE p;
+SHA(pk) IN (SELECT * FROM (SELECT '' FROM t) AS a)
+0
+0
+0
+DEALLOCATE PREPARE p;
+# Tests on derived tables
+SELECT * FROM (SELECT 1, '' FROM t) AS a;
+1	
+1	
+1	
+1	
+SELECT * FROM (SELECT '', 1 FROM t) AS a;
+	1
+	1
+	1
+	1
+SELECT * FROM (SELECT 1, 2, '' FROM t) AS a;
+1	2	
+1	2	
+1	2	
+1	2	
+SELECT * FROM (SELECT pk, '' FROM t) AS a;
+pk	
+1	
+2	
+3	
+SELECT '/', '/';
+/	/
+/	/
+SELECT * FROM (SELECT pk, '', '' as c1 FROM t) AS a;
+pk		c1
+1		
+2		
+3		
+SELECT * FROM (SELECT '', '' from t) AS a;
+ERROR 42S21: Duplicate column name ''
+SELECT * FROM (SELECT '/', '/' FROM t) AS a;
+ERROR 42S21: Duplicate column name '/'
+SELECT * FROM (SELECT '/', '/') AS a;
+ERROR 42S21: Duplicate column name '/'
+DROP TABLE t;
+# Tests on views
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+CREATE VIEW v_t AS SELECT * FROM t;
+SHOW CREATE VIEW v_t;
+View	Create View	character_set_client	collation_connection
+v_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v_t` AS select `t`.`pk` AS `pk` from `t`	latin1	latin1_swedish_ci
+SELECT SHA(pk) IN (SELECT * FROM (SELECT '' FROM v_t) AS a) FROM v_t;
+SHA(pk) IN (SELECT * FROM (SELECT '' FROM v_t) AS a)
+0
+0
+0
+SELECT * FROM (SELECT pk, '', '' as c1 FROM v_t) AS a;
+pk		c1
+1		
+2		
+3		
+SELECT * FROM (SELECT '', '' from v_t) AS a;
+ERROR 42S21: Duplicate column name ''
+SELECT * FROM (SELECT '/', '/' from v_t) AS a;
+ERROR 42S21: Duplicate column name '/'
+CREATE VIEW v1 AS SELECT '/', '/';
+SHOW CREATE VIEW v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select '/' AS `/`,'/' AS `My_exp_/`	latin1	latin1_swedish_ci
+DROP VIEW v_t, v1;
+DROP TABLE t;
+# Tests on views created using SELECT statements that contain derived columns
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+CREATE VIEW v1_t AS SELECT '' FROM t;
+SHOW CREATE VIEW v1_t;
+View	Create View	character_set_client	collation_connection
+v1_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1_t` AS select '' AS `Name_exp_1` from `t`	latin1	latin1_swedish_ci
+SELECT * FROM v1_t;
+Name_exp_1
+
+
+
+CREATE VIEW v2_t AS SELECT * FROM (SELECT '' FROM t) AS a;
+SHOW CREATE VIEW v2_t;
+View	Create View	character_set_client	collation_connection
+v2_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2_t` AS select `tmp_field` AS `Name_exp_1` from (select '' from `t`) `a`	latin1	latin1_swedish_ci
+Warnings:
+Warning	1356	View 'test.v2_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+SELECT * FROM v2_t;
+ERROR HY000: View 'test.v2_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+CREATE VIEW v3_t AS SELECT * FROM (SELECT '' as c1 FROM t) AS a;
+SHOW CREATE VIEW v3_t;
+View	Create View	character_set_client	collation_connection
+v3_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3_t` AS select `a`.`c1` AS `c1` from (select '' AS `c1` from `t`) `a`	latin1	latin1_swedish_ci
+SELECT * FROM v3_t;
+c1
+
+
+
+CREATE VIEW v4_t AS SELECT * FROM (SELECT 1, '' FROM t) AS a;
+SHOW CREATE VIEW v4_t;
+View	Create View	character_set_client	collation_connection
+v4_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4_t` AS select `a`.`1` AS `1`,`tmp_field` AS `Name_exp_2` from (select 1 AS `1`,'' from `t`) `a`	latin1	latin1_swedish_ci
+Warnings:
+Warning	1356	View 'test.v4_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+SELECT * from v4_t;
+ERROR HY000: View 'test.v4_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+CREATE VIEW v5_t AS SELECT '';
+SHOW CREATE VIEW v5_t;
+View	Create View	character_set_client	collation_connection
+v5_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v5_t` AS select '' AS `Name_exp_1`	latin1	latin1_swedish_ci
+SELECT * FROM v5_t;
+Name_exp_1
+
+CREATE VIEW v6_t AS SELECT * FROM (SELECT '') AS a;
+SHOW CREATE VIEW v6_t;
+View	Create View	character_set_client	collation_connection
+v6_t	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v6_t` AS select `tmp_field` AS `Name_exp_1` from (select '') `a`	latin1	latin1_swedish_ci
+Warnings:
+Warning	1356	View 'test.v6_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+SELECT * FROM v6_t;
+ERROR HY000: View 'test.v6_t' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them
+DROP VIEW v1_t, v2_t, v3_t, v4_t, v5_t, v6_t;
+DROP TABLE t;
+# End of 10.11 tests
+#
 # Test of "Derived tables and union can now create distinct keys"
 #
 create table t1 (a int);

mysql-test/main/derived.test

@@ -1194,6 +1194,114 @@ drop table t1,t2,t3;
 --echo # End of 10.3 tests
 --echo #
 
+--echo #
+--echo # MDEV-24588: Fix crash with unnamed column in derived table.
+--echo # Assertion `item->name.str && item->name.str[0]` in
+--echo # `TABLE_LIST::create_field_translation` fails when a SELECT
+--echo # query includes a derived table containing unnamed column
+--echo # (eg: `SELECT '' from t`).
+--echo #
+
+--echo # Tests from the bug report
+
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+
+# this should pass withiout assertion fail in dbg or should not crash mariadb server
+SELECT SHA(pk) IN (SELECT * FROM (SELECT '' FROM t) AS a) FROM t;
+
+# The PREPARE command itself should succeed without crashing
+SET sql_mode='';
+PREPARE p FROM 'SELECT SHA(pk) IN (SELECT * FROM (SELECT \'\' FROM t) AS a) FROM t;';
+
+EXECUTE p;
+EXECUTE p;
+
+DEALLOCATE PREPARE p;
+
+--echo # Tests on derived tables
+
+SELECT * FROM (SELECT 1, '' FROM t) AS a;
+SELECT * FROM (SELECT '', 1 FROM t) AS a;
+SELECT * FROM (SELECT 1, 2, '' FROM t) AS a;
+SELECT * FROM (SELECT pk, '' FROM t) AS a;
+SELECT '/', '/';
+
+SELECT * FROM (SELECT pk, '', '' as c1 FROM t) AS a;
+--error ER_DUP_FIELDNAME
+SELECT * FROM (SELECT '', '' from t) AS a;
+--error ER_DUP_FIELDNAME
+SELECT * FROM (SELECT '/', '/' FROM t) AS a;
+--error ER_DUP_FIELDNAME
+SELECT * FROM (SELECT '/', '/') AS a;
+
+DROP TABLE t;
+
+--echo # Tests on views
+
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+
+CREATE VIEW v_t AS SELECT * FROM t;
+SHOW CREATE VIEW v_t;
+
+SELECT SHA(pk) IN (SELECT * FROM (SELECT '' FROM v_t) AS a) FROM v_t;
+
+SELECT * FROM (SELECT pk, '', '' as c1 FROM v_t) AS a;
+--error ER_DUP_FIELDNAME
+SELECT * FROM (SELECT '', '' from v_t) AS a;
+--error ER_DUP_FIELDNAME
+SELECT * FROM (SELECT '/', '/' from v_t) AS a;
+
+CREATE VIEW v1 AS SELECT '/', '/';
+SHOW CREATE VIEW v1;
+
+DROP VIEW v_t, v1;
+DROP TABLE t;
+
+--echo # Tests on views created using SELECT statements that contain derived columns
+
+CREATE TABLE t (pk INT PRIMARY KEY);
+INSERT INTO t VALUES (1), (2), (3);
+
+CREATE VIEW v1_t AS SELECT '' FROM t;
+SHOW CREATE VIEW v1_t;
+
+SELECT * FROM v1_t;
+
+CREATE VIEW v2_t AS SELECT * FROM (SELECT '' FROM t) AS a;
+SHOW CREATE VIEW v2_t;
+
+--error ER_VIEW_INVALID
+SELECT * FROM v2_t;
+
+CREATE VIEW v3_t AS SELECT * FROM (SELECT '' as c1 FROM t) AS a;
+SHOW CREATE VIEW v3_t;
+
+SELECT * FROM v3_t;
+
+CREATE VIEW v4_t AS SELECT * FROM (SELECT 1, '' FROM t) AS a;
+SHOW CREATE VIEW v4_t;
+
+--error ER_VIEW_INVALID
+SELECT * from v4_t;
+
+CREATE VIEW v5_t AS SELECT '';
+SHOW CREATE VIEW v5_t;
+
+SELECT * FROM v5_t;
+
+CREATE VIEW v6_t AS SELECT * FROM (SELECT '') AS a;
+SHOW CREATE VIEW v6_t;
+
+--error ER_VIEW_INVALID
+SELECT * FROM v6_t;
+
+DROP VIEW v1_t, v2_t, v3_t, v4_t, v5_t, v6_t;
+DROP TABLE t;
+
+--echo # End of 10.11 tests
+
 --echo #
 --echo # Test of "Derived tables and union can now create distinct keys"
 --echo #

mysql-test/main/intersect_all.result

@@ -1077,3 +1077,113 @@ NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	NULL
 Warnings:
 Note	1003	/* select#1 */ select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` > 4 union all /* select#4 */ select `__4`.`a` AS `a` from (/* select#2 */ select `test`.`t2`.`a` AS `a` from `test`.`t2` where `test`.`t2`.`a` < 5 intersect all /* select#3 */ select `test`.`t3`.`a` AS `a` from `test`.`t3` where `test`.`t3`.`a` < 5) `__4`
 drop table t1,t2,t3;
+#
+# MDEV-25158 Segfault on INTERSECT ALL with UNION in Oracle mode
+#
+create table t3 (x int);
+create table u3 (x int);
+create table i3 (x int);
+explain SELECT * from t3 union select * from u3 intersect all select * from i3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	system	NULL	NULL	NULL	NULL	0	Const row not found
+4	UNION	<derived2>	ALL	NULL	NULL	NULL	NULL	2	
+2	DERIVED	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+3	INTERSECT	NULL	NULL	NULL	NULL	NULL	NULL	NULL	no matching row in const table
+NULL	INTERSECT RESULT	<intersect2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+NULL	UNION RESULT	<union1,4>	ALL	NULL	NULL	NULL	NULL	NULL	
+set sql_mode= 'oracle';
+explain SELECT * from t3 union select * from u3 intersect all select * from i3;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t3	system	NULL	NULL	NULL	NULL	0	Const row not found
+2	UNION	u3	system	NULL	NULL	NULL	NULL	0	Const row not found
+3	INTERSECT	i3	system	NULL	NULL	NULL	NULL	0	Const row not found
+NULL	UNIT RESULT	<unit1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+select * from t3 union select * from u3 intersect select * from i3;
+x
+SELECT * from t3 union select * from u3 intersect all select * from i3;
+x
+insert into t3 values (0);
+insert into i3 values (0);
+Select * from t3 union select * from u3 intersect select * from i3;
+x
+0
+SELECT * FROM t3 UNION SELECT * FROM u3 INTERSECT ALL SELECT * FROM i3;
+x
+0
+drop tables t3, u3, i3;
+# First line of these results is column names, not the result
+# (pay attention to "affected rows")
+values (1, 2) union all values (1, 2);
+1	2
+1	2
+1	2
+affected rows: 2
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3);
+1	2
+1	2
+4	3
+4	3
+affected rows: 3
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3) union all values (1, 2);
+1	2
+1	2
+4	3
+4	3
+1	2
+affected rows: 4
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3) union all values (1, 2) union values (1, 2);
+1	2
+1	2
+4	3
+affected rows: 2
+create table t1 (a int, b int);
+create table t2 like t1;
+insert t1 values (1, 2), (1, 2), (1, 2), (2, 3), (2, 3), (3, 4), (3, 4);
+insert t2 values (1, 2), (1, 2), (2, 3), (2, 3), (2, 3), (2, 3), (4, 5);
+select * from t1 intersect select * from t2;
+a	b
+1	2
+2	3
+select * from t1 intersect all select * from t2;
+a	b
+1	2
+2	3
+1	2
+2	3
+# Default: first INTERSECT ALL, then UNION
+# Oracle: first UNION, then INTERSECT ALL
+select * from t1 union values (1, 2) intersect all select * from t2;
+a	b
+1	2
+2	3
+select * from t1 union (values (1, 2) intersect all select * from t2);
+a	b
+1	2
+2	3
+3	4
+(select * from t1 union values (1, 2)) intersect all select * from t2;
+a	b
+1	2
+2	3
+select * from t1 intersect all select * from t2 union values (1, 2);
+a	b
+1	2
+2	3
+1	2
+2	3
+select * from t1 intersect all (select * from t2 union values (1, 2));
+a	b
+1	2
+2	3
+(select * from t1 intersect all select * from t2) union values (1, 2);
+a	b
+1	2
+2	3
+explain select * from t1 intersect all select * from t2 union values (1, 2);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	7	
+2	INTERSECT	t2	ALL	NULL	NULL	NULL	NULL	7	
+3	UNION	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
+NULL	UNIT RESULT	<unit1,2,3>	ALL	NULL	NULL	NULL	NULL	NULL	
+drop tables t1, t2;
+set sql_mode= default;

mysql-test/main/intersect_all.test

@@ -328,3 +328,69 @@ intersect all
 select * from t3 where a < 5;
 
 drop table t1,t2,t3;
+
+--echo #
+--echo # MDEV-25158 Segfault on INTERSECT ALL with UNION in Oracle mode
+--echo #
+create table t3 (x int);
+create table u3 (x int);
+create table i3 (x int);
+explain SELECT * from t3 union select * from u3 intersect all select * from i3;
+set sql_mode= 'oracle';
+explain SELECT * from t3 union select * from u3 intersect all select * from i3;
+select * from t3 union select * from u3 intersect select * from i3;
+SELECT * from t3 union select * from u3 intersect all select * from i3;
+insert into t3 values (0);
+insert into i3 values (0);
+Select * from t3 union select * from u3 intersect select * from i3;
+SELECT * FROM t3 UNION SELECT * FROM u3 INTERSECT ALL SELECT * FROM i3;
+drop tables t3, u3, i3;
+
+--enable_info
+--echo # First line of these results is column names, not the result
+--echo # (pay attention to "affected rows")
+
+# MSSQL:
+# 1	2
+# 1	2
+values (1, 2) union all values (1, 2);
+
+# MSSQL:
+# 1	2
+# 4	3
+# 4	3
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3);
+
+# MSSQL:
+# 1	2
+# 4	3
+# 4	3
+# 1	2
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3) union all values (1, 2);
+
+# MSSQL:
+# 1	2
+# 4	3
+values (1, 2) union all values (1, 2) union values (4, 3) union all values (4, 3) union all values (1, 2) union values (1, 2);
+--disable_info
+
+create table t1 (a int, b int);
+create table t2 like t1;
+insert t1 values (1, 2), (1, 2), (1, 2), (2, 3), (2, 3), (3, 4), (3, 4);
+insert t2 values (1, 2), (1, 2), (2, 3), (2, 3), (2, 3), (2, 3), (4, 5);
+select * from t1 intersect select * from t2;
+select * from t1 intersect all select * from t2;
+--echo # Default: first INTERSECT ALL, then UNION
+--echo # Oracle: first UNION, then INTERSECT ALL
+# VIEW is stored and executed normal mode (see Sql_mode_save_for_frm_handling)
+--disable_view_protocol
+select * from t1 union values (1, 2) intersect all select * from t2;
+--enable_view_protocol
+select * from t1 union (values (1, 2) intersect all select * from t2);
+(select * from t1 union values (1, 2)) intersect all select * from t2;
+select * from t1 intersect all select * from t2 union values (1, 2);
+select * from t1 intersect all (select * from t2 union values (1, 2));
+(select * from t1 intersect all select * from t2) union values (1, 2);
+explain select * from t1 intersect all select * from t2 union values (1, 2);
+drop tables t1, t2;
+set sql_mode= default;

mysql-test/main/join_cache_notasan.cnf

@@ -0,0 +1,5 @@
+!include include/default_my.cnf
+
+[ENV]
+MSAN_OPTIONS=allocator_may_return_null=1:abort_on_error=1
+