PS-9500: Code refresh for 8.0.41-32 (merge with conflicts)

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,13 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
+<<<<<<< HEAD
 MYSQL_VERSION_PATCH=40
 MYSQL_VERSION_EXTRA=-31
+||||||| 89e1c722476d
+MYSQL_VERSION_PATCH=40
+MYSQL_VERSION_EXTRA=
+=======
+MYSQL_VERSION_PATCH=41
+MYSQL_VERSION_EXTRA=
+>>>>>>> mysql-8.0.41
 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.
 

client/CMakeLists.txt

@@ -75,10 +75,19 @@ MYSQL_ADD_EXECUTABLE(mysqltest
   ENABLE_EXPORTS
   LINK_LIBRARIES perconaserverclient
   )
+<<<<<<< HEAD
 IF (WITH_COREDUMPER)
   TARGET_LINK_LIBRARIES(mysqltest coredumper)
 ENDIF()
 
+||||||| 89e1c722476d
+=======
+
+IF(MY_COMPILER_IS_GNU AND (WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO))
+  TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
+ENDIF()
+
+>>>>>>> mysql-8.0.41
 MYSQL_ADD_EXECUTABLE(mysqlcheck
   check/mysqlcheck.cc
   check/mysqlcheck_core.cc

cmake/component.cmake

@@ -98,6 +98,10 @@ MACRO(MYSQL_ADD_COMPONENT component_arg)
     # For APPLE: adjust path dependecy for SSL shared libraries.
     SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(${target})
 
+    IF(APPLE)
+      TARGET_LINK_OPTIONS(${target} PRIVATE LINKER:-no_warn_duplicate_libraries)
+    ENDIF()
+
     IF(WIN32_CLANG AND WITH_ASAN)
       TARGET_LINK_LIBRARIES(${target}
         "${ASAN_LIB_DIR}/clang_rt.asan_dll_thunk-x86_64.lib")

cmake/curl.cmake

@@ -128,7 +128,7 @@ FUNCTION(FIND_SYSTEM_CURL ARG_CURL_INCLUDE_DIR)
   ENDIF()
 ENDFUNCTION(FIND_SYSTEM_CURL)
 
-SET(CURL_VERSION_DIR "curl-8.9.1")
+SET(CURL_VERSION_DIR "curl-8.11.1")
 FUNCTION(MYSQL_USE_BUNDLED_CURL CURL_INCLUDE_DIR)
   SET(WITH_CURL "bundled" CACHE STRING "Bundled curl library")
   ADD_SUBDIRECTORY(extra/curl)
@@ -260,6 +260,10 @@ FUNCTION(MYSQL_CHECK_CURL)
     SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_OPTIONS
       "-Wno-error=deprecated-declarations")
   ENDIF()
+  IF(WIN32_CLANG)
+    SET_TARGET_PROPERTIES(curl_interface PROPERTIES INTERFACE_COMPILE_DEFINITIONS
+      CURL_DISABLE_DEPRECATION)
+  ENDIF()
 
 ENDFUNCTION(MYSQL_CHECK_CURL)
 

cmake/libbacktrace.cmake

@@ -0,0 +1,65 @@
+# Copyright (c) 2024, Oracle and/or its affiliates.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License, version 2.0,
+# as published by the Free Software Foundation.
+#
+# This program is also distributed 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 included license
+# documentation.  The authors of MySQL hereby grant you an additional
+# permission to link the program and your derivative works with the
+# separately licensed software that they have included with MySQL.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License, version 2.0, for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+
+SET(VERIFIED_BACKTRACE_PLATFORMS
+  FREEBSD
+  LINUX
+  SOLARIS
+  )
+
+UNSET(VERIFIED_BACKTRACE_PLATFORM)
+FOREACH(platform ${VERIFIED_BACKTRACE_PLATFORMS})
+  IF(${platform})
+    MESSAGE(STATUS "Found verified platform ${platform} for libbacktrace")
+    SET(VERIFIED_BACKTRACE_PLATFORM ${platform})
+    BREAK()
+  ENDIF()
+ENDFOREACH()
+
+IF(VERIFIED_BACKTRACE_PLATFORM AND NOT WITH_VALGRIND)
+  SET(DEFAULT_WITH_EXT_BACKTRACE ON)
+ELSE()
+  SET(DEFAULT_WITH_EXT_BACKTRACE OFF)
+ENDIF()
+OPTION(WITH_EXT_BACKTRACE "Use libbacktrace to print stacktraces"
+  ${DEFAULT_WITH_EXT_BACKTRACE}
+)
+
+FUNCTION(MYSQL_CHECK_BACKTRACE)
+  IF(NOT WITH_EXT_BACKTRACE)
+    RETURN()
+  ENDIF()
+
+  IF(NOT LINUX AND NOT SOLARIS AND NOT FREEBSD)
+    MESSAGE(FATAL_ERROR
+      "libbacktrace can only be used on linux/solaris/freebsd builds")
+  ENDIF()
+
+  IF(VERIFIED_BACKTRACE_PLATFORM)
+    MESSAGE(STATUS "Using libbacktrace on ${VERIFIED_BACKTRACE_PLATFORM}")
+  ELSE()
+    MESSAGE(WARNING "Using libbacktrace on unverified platform")
+  ENDIF()
+
+  ADD_SUBDIRECTORY(extra/libbacktrace)
+  ADD_LIBRARY(ext::backtrace ALIAS backtrace)
+ENDFUNCTION(MYSQL_CHECK_BACKTRACE)

cmake/libutils.cmake

@@ -358,6 +358,7 @@ MACRO(MERGE_LIBRARIES_SHARED TARGET_ARG)
 
   IF(APPLE)
     SET_TARGET_PROPERTIES(${TARGET} PROPERTIES MACOSX_RPATH ON)
+    TARGET_LINK_OPTIONS(${TARGET} PRIVATE LINKER:-no_warn_duplicate_libraries)
   ENDIF()
 
   MY_TARGET_LINK_OPTIONS(${TARGET} "${export_link_flags}")
@@ -692,6 +693,10 @@ FUNCTION(ADD_SHARED_LIBRARY TARGET_ARG)
     ENDIF()
   ENDIF()
 
+  IF(APPLE)
+    TARGET_LINK_OPTIONS(${TARGET} PRIVATE LINKER:-no_warn_duplicate_libraries)
+  ENDIF()
+
   ADD_OBJDUMP_TARGET(show_${TARGET} "$<TARGET_FILE:${TARGET}>"
     DEPENDS ${TARGET})
 

cmake/mysql_add_executable.cmake

@@ -192,6 +192,10 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
     MACOS_ADD_DEVELOPER_ENTITLEMENTS(${target})
   ENDIF()
 
+  IF(APPLE)
+    TARGET_LINK_OPTIONS(${target} PRIVATE LINKER:-no_warn_duplicate_libraries)
+  ENDIF()
+
   IF(WIN32_CLANG AND WITH_ASAN)
     TARGET_LINK_LIBRARIES(${target} "${ASAN_LIB_DIR}/clang_rt.asan-x86_64.lib")
     TARGET_LINK_LIBRARIES(${target} "${ASAN_LIB_DIR}/clang_rt.asan_cxx-x86_64.lib")

cmake/os/SunOS.cmake

@@ -54,8 +54,9 @@ IF(NOT FORCE_UNSUPPORTED_COMPILER)
     MESSAGE(WARNING "Clang is experimental!!")
   ELSEIF(MY_COMPILER_IS_GNU)
     # 9.2.0 generated code which dumped core in optimized mode.
-    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 10.2)
-      MESSAGE(FATAL_ERROR "GCC 10.2 or newer is required")
+    # gcc 10.2 is EOL.
+    IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.4)
+      MESSAGE(FATAL_ERROR "GCC 11.4 or newer is required")
     ENDIF()
   ELSE()
     MESSAGE(FATAL_ERROR "Unsupported compiler!")

cmake/plugin.cmake

@@ -327,6 +327,10 @@ MACRO(MYSQL_ADD_PLUGIN plugin_arg)
       DEPENDS ${target})
   ENDIF()
 
+  IF(BUILD_PLUGIN AND ARG_MODULE_ONLY AND APPLE)
+    TARGET_LINK_OPTIONS(${target} PRIVATE LINKER:-no_warn_duplicate_libraries)
+  ENDIF()
+
   IF(BUILD_PLUGIN)
     ADD_DEPENDENCIES(plugin_all ${target})
     TARGET_COMPILE_FEATURES(${target} PUBLIC cxx_std_17)

cmake/rapidjson.cmake

@@ -125,7 +125,8 @@ MACRO (MYSQL_CHECK_RAPIDJSON)
   TARGET_COMPILE_DEFINITIONS(rapidjson INTERFACE
     RAPIDJSON_NO_SIZETYPEDEFINE
     RAPIDJSON_SCHEMA_USE_INTERNALREGEX=0
-    RAPIDJSON_SCHEMA_USE_STDREGEX=1)
+    RAPIDJSON_SCHEMA_USE_STDREGEX=1
+    RAPIDJSON_HAS_STDSTRING=1)
 
   IF(WITH_RAPIDJSON STREQUAL "bundled")
     TARGET_INCLUDE_DIRECTORIES(rapidjson SYSTEM BEFORE INTERFACE

cmake/readline.cmake

@@ -114,7 +114,7 @@ MACRO (FIND_CURSES)
  ENDIF()
 ENDMACRO()
 
-SET(CURRENT_LIBEDIT_DIRECTORY "extra/libedit/libedit-20221030-3.1")
+SET(CURRENT_LIBEDIT_DIRECTORY "extra/libedit/libedit-20240808-3.1")
 
 MACRO (MYSQL_USE_BUNDLED_EDITLINE)
   SET(WITH_EDITLINE "bundled" CACHE STRING "By default use bundled editline")

cmake/rpc.cmake

@@ -85,8 +85,13 @@ FUNCTION(MYSQL_CHECK_RPC)
   IF(TIRPC_FOUND AND NOT WITH_TIRPC STREQUAL "bundled")
     SET(WITH_TIRPC "system" CACHE INTERNAL "")
     ADD_LIBRARY(ext::rpc SHARED IMPORTED GLOBAL)
+    IF(DEFINED pkgcfg_lib_TIRPC_tirpc)
+      SET(tirpc_imported_location ${pkgcfg_lib_TIRPC_tirpc})
+    ELSE()
+      SET(tirpc_imported_location ${TIRPC_LDFLAGS})
+    ENDIF()
     SET_TARGET_PROPERTIES(ext::rpc PROPERTIES
-      IMPORTED_LOCATION ${pkgcfg_lib_TIRPC_tirpc}
+      IMPORTED_LOCATION ${tirpc_imported_location}
       INTERFACE_COMPILE_DEFINITIONS HAVE_SYSTEM_TIRPC
       )
     TARGET_INCLUDE_DIRECTORIES(ext::rpc

components/keyrings/common/config/config_reader.h

@@ -26,8 +26,6 @@
 
 #include <string>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>

components/keyrings/common/json_data/json_reader.h

@@ -28,8 +28,6 @@
 #include <string>
 #include <vector>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>

components/keyrings/common/json_data/json_writer.h

@@ -26,8 +26,6 @@
 
 #include <string>
 
-#define RAPIDJSON_HAS_STDSTRING 1
-
 #include "my_rapidjson_size_t.h"
 
 #include <rapidjson/document.h>