Merge branch '11.8' into 12.3

Author: vuvova

.gitignore

@@ -271,6 +271,8 @@ support-files/mariadb-extra.socket
 support-files/mariadb@.service
 support-files/mariadb@.socket
 support-files/mariadb-extra@.socket
+support-files/mariadb-plugin-config.cmake
+support-files/mariadb-plugin-defines.cmake
 support-files/mini-benchmark
 support-files/my-huge.cnf
 support-files/my-innodb-heavy-4G.cnf

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Copyright (c) 2006, 2017, Oracle and/or its affiliates.
-# Copyright (c) 2008, 2022, MariaDB Corporation.
+# Copyright (c) 2008, 2026, MariaDB Corporation.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -500,7 +500,18 @@ SET(PYTHON_SHEBANG "/usr/bin/env python3" CACHE STRING "python shebang")
 MARK_AS_ADVANCED(PYTHON_SHEBANG)
 
 # Add storage engines and plugins.
-CONFIGURE_PLUGINS()
+IF(NOT WITHOUT_SERVER)
+  FILE(GLOB dirs_storage ${CMAKE_SOURCE_DIR}/storage/*)
+ENDIF()
+
+FILE(GLOB dirs_plugin ${CMAKE_SOURCE_DIR}/plugin/*)
+FOREACH(dir ${dirs_storage} ${dirs_plugin})
+  IF (EXISTS ${dir}/CMakeLists.txt)
+    ADD_SUBDIRECTORY(${dir})
+  ENDIF()
+ENDFOREACH()
+
+VERIFY_PLUGINS()
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(dbug)

appveyor.yml

@@ -57,7 +57,7 @@ build_script:
   - set PATH=%OPENSSL_ROOT_DIR%;%PATH%
   - set GENERATOR=-GNinja
   - call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
-  - cmake -E time cmake %GENERATOR% .. -DWITH_SSL=system -DHAVE_OPENSSL_APPLINK_C=1 -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO
+  - cmake -E time cmake %GENERATOR% .. -DWITH_SSL=system -DHAVE_OPENSSL_APPLINK_C=1 -DOPENSSL_ROOT_DIR=%OPENSSL_ROOT_DIR% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DMYSQL_MAINTAINER_MODE=ERR -DFAST_BUILD=1 -DBISON_EXECUTABLE=C:\cygwin64\bin\bison.exe -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_FEEDBACK=NO -DPLUGIN_ROCKSDB=NO
   - set /A jobs=2*%NUMBER_OF_PROCESSORS%
   - cmake -E time cmake --build . -j %jobs% --config %BUILD_TYPE% --target minbuild
 

client/mysqladmin.cc

@@ -50,8 +50,6 @@ static bool sql_log_bin_off= false;
 static uint opt_protocol=0;
 static myf error_flags; /* flags to pass to my_printf_error, like ME_BELL */
 
-static my_bool ex_status_printed = 0; /* First output is not relative. */
-
 #include <sslopt-vars.h>
 
 static void print_version(void);
@@ -926,7 +924,6 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
         (*func)(res, row, rownr++);
       print_top(res);
 
-      ex_status_printed = 1; /* From now on the output will be relative */
       mysql_free_result(res);
       break;
     }

client/mysqlbinlog.cc

@@ -128,7 +128,7 @@ static my_bool print_row_count_used= 0, print_row_event_positions_used= 0;
 static my_bool debug_info_flag, debug_check_flag;
 static my_bool force_if_open_opt= 1;
 static my_bool opt_raw_mode= 0, opt_stop_never= 0;
-my_bool opt_gtid_strict_mode= true;
+my_bool opt_gtid_strict_mode= false;
 static ulong opt_stop_never_slave_server_id= 0;
 static my_bool opt_verify_binlog_checksum= 1;
 static ulonglong offset = 0;
@@ -1752,7 +1752,7 @@ static struct my_option my_options[] =
    "start < stop comparison condition. Sequence numbers of any gtid domain "
    "must comprise monotically growing sequence",
    &opt_gtid_strict_mode, &opt_gtid_strict_mode, 0,
-   GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
+   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"stop-datetime", OPT_STOP_DATETIME,
    "Stop reading the binlog at first event having a datetime equal or "
    "posterior to the argument; the argument must be a date and time "

cmake/generate_sbom.cmake

@@ -18,6 +18,25 @@ FUNCTION (EXTRACT_REPO_NAME_AND_USER repo_url repo_name_var repo_user_var)
   SET(${repo_user_var} ${repo_user} PARENT_SCOPE)
 ENDFUNCTION()
 
+# Extract a valid RFC 5322 email address out of CPACK_PACKAGE_CONTACT.
+# CPACK_PACKAGE_CONTACT is normally in the "Display Name <email@domain>" form,
+# but a bare "email@domain" is also accepted. FATAL_ERROR if no valid email
+# can be found, since the SBOM schema requires the author's email to be a
+# real address.
+FUNCTION(SBOM_GET_CONTACT_EMAIL varname)
+  SET(email_regex "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]+$")
+  STRING(REGEX MATCH "<([^>]+)>" bracketed "${CPACK_PACKAGE_CONTACT}")
+  IF(bracketed)
+    SET(email "${CMAKE_MATCH_1}")
+  ELSE()
+    SET(email "${CPACK_PACKAGE_CONTACT}")
+  ENDIF()
+  IF(NOT email MATCHES "${email_regex}")
+    MESSAGE(FATAL_ERROR "CPACK_PACKAGE_CONTACT ('${CPACK_PACKAGE_CONTACT}') does not contain a valid email address")
+  ENDIF()
+  SET(${varname} "${email}" PARENT_SCOPE)
+ENDFUNCTION()
+
 # Add a known 3rd party dependency for SBOM generation
 # Currently used for "vendored" (part of our repository) source code we know about
 # such as zlib, as well ExternalProject_Add() projects
@@ -303,7 +322,8 @@ FUNCTION(GENERATE_SBOM)
     STRING(APPEND reflist ",\n    {\"ref\": \"${bom_ref}\"}")
   ENDFOREACH()
   STRING(APPEND sbom_dependencies "\n      ]\n    }${reflist}\n")
-  STRING(UUID UUID NAMESPACE ee390ca3-e70f-4b35-808e-a512489156f5 NAME SBOM TYPE SHA1)
+  STRING(RANDOM LENGTH 20 rnd)
+  STRING(UUID UUID NAMESPACE ee390ca3-e70f-4b35-808e-a512489156f5 NAME SBOM-${rnd} TYPE SHA1)
   STRING(TIMESTAMP TIMESTAMP "%Y-%m-%dT%H:%M:%SZ" UTC)
   EXTRACT_REPO_NAME_AND_USER("${GIT_REMOTE_ORIGIN_URL}" GITHUB_REPO_NAME GITHUB_REPO_USER)
   #github-purl needs lowercased user and project names
@@ -313,5 +333,6 @@ FUNCTION(GENERATE_SBOM)
     SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
   ENDIF()
   STRING(TIMESTAMP CURRENT_YEAR "%Y")
+  SBOM_GET_CONTACT_EMAIL(SBOM_AUTHOR_EMAIL)
   configure_file(${CMAKE_CURRENT_LIST_DIR}/cmake/sbom.json.in ${CMAKE_BINARY_DIR}/sbom.json)
 ENDFUNCTION()

cmake/install_macros.cmake

@@ -300,36 +300,3 @@ ENDFUNCTION()
 # For Makefile generators we default Debug build directory to ${buildroot}/../debug.
 GET_FILENAME_COMPONENT(BINARY_PARENTDIR ${CMAKE_BINARY_DIR} PATH)
 SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug build")
-
-FUNCTION(INSTALL_MYSQL_TEST from to)
-  IF(INSTALL_MYSQLTESTDIR)
-    IF(NOT WITH_WSREP)
-      SET(EXCL_GALERA "(suite/(galera|wsrep|sys_vars/[rt]/(sysvars_)?wsrep).*|std_data/(galera|wsrep).*)")
-    ELSE()
-      SET(EXCL_GALERA "^DOES_NOT_EXIST$")
-    ENDIF()
-    INSTALL(
-      DIRECTORY ${from}
-      DESTINATION "${INSTALL_MYSQLTESTDIR}/${to}"
-      USE_SOURCE_PERMISSIONS
-      COMPONENT Test
-      PATTERN "var" EXCLUDE
-      PATTERN "lib/My/SafeProcess" EXCLUDE
-      PATTERN "lib/t*" EXCLUDE
-      PATTERN "CPack" EXCLUDE
-      PATTERN "CMake*" EXCLUDE
-      PATTERN "cmake_install.cmake" EXCLUDE
-      PATTERN "mtr.out*" EXCLUDE
-      PATTERN ".cvsignore" EXCLUDE
-      PATTERN "*.am" EXCLUDE
-      PATTERN "*.in" EXCLUDE
-      PATTERN "Makefile" EXCLUDE
-      PATTERN "*.vcxproj" EXCLUDE
-      PATTERN "*.vcxproj.filters" EXCLUDE
-      PATTERN "*.vcxproj.user" EXCLUDE
-      PATTERN "CTest*" EXCLUDE
-      PATTERN "*~" EXCLUDE
-      REGEX "${EXCL_GALERA}" EXCLUDE
-    )
-  ENDIF()
-ENDFUNCTION()

cmake/make_dist.cmake.in

@@ -107,6 +107,13 @@ IF(NOT GIT_EXECUTABLE)
   )
 ENDIF()
 
+# DuckDB uses these symbolic links only to test globbing behavior. They cause
+# source package extraction failures with tar on Windows.
+FILE(REMOVE
+  "${PACKAGE_DIR}/storage/duckdb/third_parties/duckdb/data/csv/glob/crawl/.symbolic_link/link_to_file"
+  "${PACKAGE_DIR}/storage/duckdb/third_parties/duckdb/data/csv/glob/crawl/.symbolic_link/mydir/link_to_upper_dir"
+)
+
 # Copy bison output
 CONFIGURE_FILE(${CMAKE_BINARY_DIR}/sql/yy_mariadb.hh
    ${PACKAGE_DIR}/sql/yy_mariadb.hh COPYONLY)

cmake/mysql_add_executable.cmake

@@ -98,14 +98,11 @@ FUNCTION (MYSQL_ADD_EXECUTABLE)
   IF(link)
     IF(UNIX)
       ADD_CUSTOM_COMMAND(TARGET ${target} POST_BUILD
-        COMMAND ${CMAKE_COMMAND} -E create_symlink
-         ${target} ${link}
+        COMMAND ${CMAKE_COMMAND} -E create_symlink ${target} ${link}
         COMMENT "Creating ${link} link"
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR})
-      INSTALL(PROGRAMS
-         ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${link}
-         DESTINATION
-         ${ARG_DESTINATION}
+        WORKING_DIRECTORY $<TARGET_FILE_DIR:${target}>/)
+      INSTALL(PROGRAMS $<TARGET_FILE_DIR:${target}>/${link}
+         DESTINATION ${ARG_DESTINATION}
          COMPONENT ${COMP}Symlinks)
     ELSE()
       # Windows note: