Merge tag 'Percona-Server-8.0.41-32' into 8.0

Percona Server release 8.0.41-32

Author: inikep

CMakeLists.txt

@@ -55,26 +55,18 @@ IF(WIN32)
     ENDIF()
   ENDIF()
 ELSEIF(APPLE)
-  # Version 3.12.4 is needed because the new build system of Xcode is not
-  # supported by cmake. 3.12.4 will force using the legacy build system.
-  # Version 3.9.2 is needed because INCLUDE_DIRECTORIES(SYSTEM ...) wasn't
-  # handled properly by the cmake Xcode generator.
-  # NOTE:
-  # cmake >= 3.19 will use the new build system by default for Xcode >= 12.x
   IF(CMAKE_GENERATOR STREQUAL "Xcode")
     SET(APPLE_XCODE 1)
-    CMAKE_MINIMUM_REQUIRED(VERSION 3.12.4)
-  ELSE()
-    CMAKE_MINIMUM_REQUIRED(VERSION 3.9.2)
   ENDIF()
-  # If this is macOS 11, we need cmake 3.18
+  # For macOS version >= 11 we need cmake 3.18
   # System libraries like
   #    /usr/lib/libresolv.dylib
   # are no longer present in the file system.
   # cmake >= 3.18 will look for .tbd files in the SDK instead
   # So we end up linking with:
   #    /Applications/Xcode.app/.../usr/lib/libresolv.tbd
-  # We must postpone the version test until we have called 'uname -r' below.
+  # cmake >= 3.19 will use the new build system by default for Xcode >= 12.x
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.19)
 ELSEIF(UNIX)
   # This is currently minimum version on all supported platforms.
   IF(CMAKE_VERSION VERSION_LESS 3.11.2)
@@ -515,20 +507,20 @@ IF(CMAKE_HOST_UNIX AND NOT FORCE_UNSUPPORTED_COMPILER
         ENDIF()
       ENDIF()
     ELSEIF(SOLARIS)
-      MESSAGE(STATUS "Looking for GCC 10 on Solaris.")
+      MESSAGE(STATUS "Looking for GCC 11 on Solaris.")
       FIND_PROGRAM(ALTERNATIVE_GCC gcc
         NO_DEFAULT_PATH
-        PATHS "/usr/gcc/10/bin")
+        PATHS "/usr/gcc/11/bin")
       FIND_PROGRAM(ALTERNATIVE_GPP g++
         NO_DEFAULT_PATH
-        PATHS "/usr/gcc/10/bin")
+        PATHS "/usr/gcc/11/bin")
       IF (ALTERNATIVE_GCC AND ALTERNATIVE_GPP)
         SET(CMAKE_C_COMPILER ${ALTERNATIVE_GCC})
         SET(CMAKE_CXX_COMPILER ${ALTERNATIVE_GPP})
         MESSAGE(STATUS "Using ${ALTERNATIVE_GCC}")
         MESSAGE(STATUS "Using ${ALTERNATIVE_GPP}")
       ELSE()
-        MESSAGE(WARNING "Could not find /usr/gcc/10/bin/gcc")
+        MESSAGE(WARNING "Could not find /usr/gcc/11/bin/gcc")
       ENDIF()
     ENDIF()
   ENDIF()
@@ -875,6 +867,7 @@ INCLUDE(zlib)
 INCLUDE(zstd)
 INCLUDE(lz4)
 INCLUDE(icu)
+INCLUDE(libbacktrace)
 INCLUDE(libevent)
 INCLUDE(ssl)
 INCLUDE(sasl)
@@ -1831,6 +1824,9 @@ IF(WITH_SYSTEM_LIBS)
   UNSET(WITH_SYSTEM_LIBS CACHE)
 ENDIF()
 
+# See whether backtrace is supported.
+MYSQL_CHECK_BACKTRACE()
+
 # Add bundled or system zlib.
 MYSQL_CHECK_ZLIB()
 
@@ -2278,6 +2274,7 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError)
 
 ADD_SUBDIRECTORY(include)
 ADD_SUBDIRECTORY(strings)
+ADD_SUBDIRECTORY(extra/unordered_dense)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)

LICENSE

@@ -1,25 +1,25 @@
 Licensing Information User Manual
 
-MySQL 8.0.40 Community
+MySQL 8.0.41 Community
      __________________________________________________________________
 
 Introduction
 
    This License Information User Manual contains Oracle's product license
    and other licensing information, including licensing information for
    third-party software which may be included in this distribution of
-   MySQL 8.0.40 Community.
+   MySQL 8.0.41 Community.
 
-   Last updated: September 2024
+   Last updated: November 2024
 
 Licensing Information
 
-   This release of MySQL 8.0.40 Community is brought to you by the MySQL
+   This release of MySQL 8.0.41 Community is brought to you by the MySQL
    team at Oracle. This software is released under version 2 of the GNU
    General Public License (GPLv2), as set forth below, with the following
    additional permissions:
 
-   This distribution of MySQL 8.0.40 Community is designed to work with
+   This distribution of MySQL 8.0.41 Community is designed to work with
    certain software (including but not limited to OpenSSL) that is
    licensed under separate terms, as designated in a particular file or
    component or in the license documentation. Without limiting your rights
@@ -1042,6 +1042,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Google Protocol Buffers
 
+You may be receiving a copy of abseil-cpp as part of this product in object code
+ form.
+The terms of the Oracle license do NOT apply to abseil-cpp.
+abseil-cpp is licensed under the Apache 2.0 license, separate from the Oracle pr
+oduct.
+If you do not wish to install this library, you may remove it, but the Oracle pr
+ogram
+might not operate properly or at all without it.
+
 Copyright 2008 Google Inc.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -1670,7 +1679,14 @@ SUCH DAMAGE.
 
 Kerberos5
 
-Kerberos5
+You may be receiving a copy of the kerberos documentation as part of this
+product. The terms of the Oracle license do NOT apply to Kerberos documentation.
+
+Kerberos documentation is licensed under the CC-BY-SA 3.0 license, separate from
+
+the Oracle product.
+If you do not wish to install this library, you may remove it, but
+the Oracle program might not operate properly or at all without it.
 
 Copyright (C) 1985-2019 by the Massachusetts Institute of Technology.
 

MYSQL_VERSION

@@ -1,5 +1,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=40
-MYSQL_VERSION_EXTRA=-31
+MYSQL_VERSION_PATCH=41
+MYSQL_VERSION_EXTRA=-32
 MYSQL_VERSION_STABILITY="LTS"

README.MySQL

@@ -1,4 +1,4 @@
-Copyright (c) 2000, 2024, Oracle and/or its affiliates.
+Copyright (c) 2000, 2025, Oracle and/or its affiliates.
 
 This is a release of MySQL, an SQL database server.
 

build-ps/build-binary.sh

@@ -33,7 +33,6 @@ COMMON_FLAGS=''
 TOKUDB_BACKUP_VERSION=''
 # enable asan
 ENABLE_ASAN=0
-FIPSMODE=0
 #
 # Some programs that may be overriden
 TAR=${TAR:-tar}
@@ -107,11 +106,6 @@ do
             exit 3
         fi
         ;;
-    --enable-fipsmode )
-        shift
-        FIPSMODE=1
-        WITH_SSL="OFF"
-        ;;
     --with-zenfs )
         shift
         TARBALL_SUFFIX="-zenfs"
@@ -183,19 +177,10 @@ elif [ -n "$(command -v git)" -a -d "$SOURCEDIR/.git" ];
 then
     REVISION="$(git rev-parse --short HEAD)"
 fi
-if [ x"${FIPSMODE}" == x1 ]; then
-    PRODUCT_FULL="Percona-Server-Pro-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-else
-    PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
-fi
+PRODUCT_FULL="Percona-Server-$MYSQL_VERSION-$PERCONA_SERVER_VERSION"
 PRODUCT_FULL="$PRODUCT_FULL-$TAG$(uname -s)${DIST_NAME:-}.$TARGET${GLIBC_VER:-}${TARBALL_SUFFIX:-}"
-if [ x"${FIPSMODE}" == x1 ]; then
-    COMMENT="Percona Server Pro (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
-    COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
-else
-    COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
-    COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
-fi
+COMMENT="Percona Server (GPL), Release ${MYSQL_VERSION_EXTRA#-}"
+COMMENT="$COMMENT, Revision $REVISION${BUILD_COMMENT:-}"
 
 # Compilation flags
 export CC=${CC:-gcc}
@@ -327,11 +312,7 @@ fi
 )
 
 (
-if [ x"${FIPSMODE}" == x1 ]; then
-    LIBLIST="libaio.so.1 libnuma.so.1 libgssapi.so libldap_r-2.4.so.2 libldap.so.2 liblber-2.4.so.2 liblber.so.2 libreadline.so libtinfo.so libbrotlidec.so libbrotlicommon.so librtmp.so libgssapi_krb5.so libkrb5.so libsmime3.so libnss3.so libnssutil3.so libplc4.so libnspr4.so libplds4.so libncurses.so.5 libtinfo.so.5 component_encryption_udf.so component_uuid_vx_udf.so component_keyring_kms.so component_masking_functions.so"
-else
     LIBLIST="libaio.so.1 libnuma.so.1 libgssapi.so libldap_r-2.4.so.2 libldap.so.2 liblber-2.4.so.2 liblber.so.2 libreadline.so libtinfo.so libbrotlidec.so libbrotlicommon.so librtmp.so libgssapi_krb5.so libkrb5.so libk5crypto.so libsmime3.so libnss3.so libnssutil3.so libplc4.so libnspr4.so libplds4.so libncurses.so.5 libtinfo.so.5 component_encryption_udf.so component_uuid_vx_udf.so component_keyring_kms.so component_masking_functions.so"
-fi
     DIRLIST="bin lib lib/private lib/plugin lib/mysqlrouter/plugin lib/mysqlrouter/private"
 
     LIBPATH=""

build-ps/debian/extra/apparmor-profile

@@ -12,6 +12,7 @@
   /sys/devices/system/node/ r,
   /sys/devices/system/node/** r,
   /proc/*/status r,
+  /proc/*/mem r,
   capability sys_resource,
   capability dac_override,
   capability setuid,

build-ps/debian/extra/apparmor.d/old_apparmor

@@ -12,6 +12,7 @@
   /sys/devices/system/node/ r,
   /sys/devices/system/node/** r,
   /proc/*/status r,
+  /proc/*/mem r,
   capability sys_resource,
   capability dac_override,
   capability setuid,

build-ps/debian/extra/apparmor.d/usr.sbin.mysqld.in2

@@ -12,6 +12,7 @@
   /sys/devices/system/node/ r,
   /sys/devices/system/node/** r,
   /proc/*/status r,
+  /proc/*/mem r,
   capability sys_resource,
   capability dac_override,
   capability setuid,

build-ps/debian/rules

@@ -7,18 +7,12 @@ export DH_VERBOSE=1
 export CFLAGS=
 export CXXFLAGS=
 export CPPFLAGS=
-export FIPSMODE=0
 
 PACKAGE=percona-server
 PS_VERSION_EXTRA = '@@PERCONA_VERSION_EXTRA@@'
 REVISION = '@@REVISION@@'
-ifeq ($(FIPSMODE),1)
-	COMPILATION_COMMENT_RELEASE = "Percona Server Pro (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
-	COMPILATION_COMMENT_DEBUG = "Percona Server Pro - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
-else
-	COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
-	COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
-endif
+COMPILATION_COMMENT_RELEASE = "Percona Server (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
+COMPILATION_COMMENT_DEBUG = "Percona Server - Debug (GPL), Release $(PS_VERSION_EXTRA), Revision $(REVISION)"
 TOKUDB_BACKUP_VERSION = "@@TOKUDB_BACKUP_VERSION@@"
 
 TMP=$(CURDIR)/debian/tmp/