Implemented PS-9289 (Merge MySQL 8.0.39) (merge with conflicts)

https://jira.percona.com/browse/PS-9289

Author: lukin-oleksiy

CMakeLists.txt

@@ -911,7 +911,7 @@ IF(WIN32)
   OPTION(WITH_MSCRT_DEBUG "MS Visual Studio Debug CRT instrumentation" OFF)
 ENDIF()
 IF(NOT WITHOUT_SERVER)
-  IF(FPROFILE_GENERATE OR FPROFILE_USE)
+  IF(FPROFILE_GENERATE)
     # Do not use data from unit testing when optimizing.
     OPTION(WITH_UNIT_TESTS "Compile MySQL with unit tests" OFF)
   ELSE()
@@ -1270,6 +1270,7 @@ ENDIF()
 # You need to install the 'lld' RPM/DEB package.
 # LTO build fails with lld, so turn it off by default.
 IF(LINUX AND NOT ALTERNATIVE_LD AND
+    NOT ${CMAKE_LINKER} MATCHES "ld\.lld" AND
     NOT WITH_LTO AND NOT CMAKE_COMPILER_FLAG_WITH_LTO)
   OPTION(USE_LD_LLD "Use llvm lld linker" ON)
 ELSE()
@@ -2075,6 +2076,12 @@ IF(LINUX)
   HAVE_PTHREAD_SETNAME_NP)
 ENDIF()
 
+# The bundled version must be set up after all the configure stuff above.
+IF(LINUX AND WITH_TCMALLOC STREQUAL "bundled")
+  ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extra/gperftools)
+  SET(MALLOC_LIBRARY "${CMAKE_BINARY_DIR}/lib/libtcmalloc.so")
+ENDIF()
+
 # Cannot use system tirpc with custom OpenSSL
 IF(WITH_SSL_PATH AND (LINUX_RHEL8 OR LINUX_RHEL9))
   SET(WITH_TIRPC "bundled")
@@ -2252,6 +2259,10 @@ ADD_SUBDIRECTORY(sql-common/oci)
 IF(NOT WITHOUT_SERVER)
   IF(WITH_UNIT_TESTS)
     IF(WIN32)
+      # static thread_local objects are not allowed in a .dll
+      SET(WITH_SHARED_UNITTEST_LIBRARY_DEFAULT OFF)
+    ELSEIF(APPLE AND WITH_SOME_SANITIZER)
+      # several down_cast<Json_something> will assert()
       SET(WITH_SHARED_UNITTEST_LIBRARY_DEFAULT OFF)
     ELSE()
       SET(WITH_SHARED_UNITTEST_LIBRARY_DEFAULT ON)
@@ -2689,6 +2700,7 @@ ENDIF(DOXYGEN_FOUND)
 
 MYSQL_ADD_EXECUTABLE(stack_direction
   ${CMAKE_SOURCE_DIR}/cmake/stack_direction.c
+  EXCLUDE_FROM_PGO
   SKIP_INSTALL
   )
 

LICENSE

@@ -1,25 +1,25 @@
 Licensing Information User Manual
 
-MySQL 8.0.37 Community
+MySQL 8.0.39 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.37 Community.
+   MySQL 8.0.39 Community.
 
-   Last updated: March 2024
+   Last updated: July 2024
 
 Licensing Information
 
-   This release of MySQL 8.0.37 Community is brought to you by the MySQL
+   This release of MySQL 8.0.39 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.37 Community is designed to work with
+   This distribution of MySQL 8.0.39 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

MYSQL_VERSION

@@ -1,5 +1,13 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
+<<<<<<< HEAD
 MYSQL_VERSION_PATCH=37
 MYSQL_VERSION_EXTRA=-29
+||||||| 6dcee9fa4b1
+MYSQL_VERSION_PATCH=37
+MYSQL_VERSION_EXTRA=
+=======
+MYSQL_VERSION_PATCH=39
+MYSQL_VERSION_EXTRA=
+>>>>>>> mysql-8.0.39
 MYSQL_VERSION_STABILITY="LTS"

cmake/copy_custom_library.cmake

@@ -57,7 +57,7 @@ STRING(REPLACE "patchelf" "" PATCHELF_VERSION "${PATCHELF_VERSION}")
 
 IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND
     PATCHELF_VERSION VERSION_LESS "0.14.5")
-  SET(PATCHELF_PAGE_SIZE_ARGS --page-size ${CPU_PAGE_SIZE})
+  SET(PATCHELF_PAGE_SIZE_ARGS --page-size 65536)
 ENDIF()
 
 # Patch RPATH so that we find NEEDED libraries at load time.

cmake/copy_openssl_binary.cmake

@@ -57,7 +57,7 @@ IF(LINUX)
 
   IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64" AND
       PATCHELF_VERSION VERSION_LESS "0.14.5")
-    SET(PATCHELF_PAGE_SIZE_ARGS --page-size ${CPU_PAGE_SIZE})
+    SET(PATCHELF_PAGE_SIZE_ARGS --page-size 65536)
   ENDIF()
 
   EXECUTE_PROCESS(

cmake/googletest.cmake

@@ -21,7 +21,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-SET(GOOGLETEST_RELEASE googletest-release-1.12.0)
+SET(GOOGLETEST_RELEASE googletest-1.14.0)
 SET(GMOCK_SOURCE_DIR
   ${CMAKE_SOURCE_DIR}/extra/googletest/${GOOGLETEST_RELEASE}/googlemock)
 SET(GTEST_SOURCE_DIR

cmake/install_macros.cmake

@@ -648,7 +648,6 @@ FUNCTION(COPY_OPENSSL_BINARY executable_full_filename
     -DOPENSSL_VERSION="${OPENSSL_VERSION}"
     -DINSTALL_PRIV_LIBDIR="${INSTALL_PRIV_LIBDIR}"
     -DPATCHELF_EXECUTABLE="${PATCHELF_EXECUTABLE}"
-    -DCPU_PAGE_SIZE="${CPU_PAGE_SIZE}"
     -DBUILD_IS_SINGLE_CONFIG="${BUILD_IS_SINGLE_CONFIG}"
     -DCMAKE_GENERATOR="${CMAKE_GENERATOR}"
     -DCMAKE_SYSTEM_PROCESSOR="${CMAKE_SYSTEM_PROCESSOR}"
@@ -755,7 +754,6 @@ FUNCTION(COPY_CUSTOM_SHARED_LIBRARY library_full_filename subdir
     -Dlibrary_version="${library_version}"
     -Dsubdir="${subdir}"
     -DPATCHELF_EXECUTABLE="${PATCHELF_EXECUTABLE}"
-    -DCPU_PAGE_SIZE="${CPU_PAGE_SIZE}"
     -DCMAKE_SYSTEM_PROCESSOR="${CMAKE_SYSTEM_PROCESSOR}"
     -P ${CMAKE_SOURCE_DIR}/cmake/copy_custom_library.cmake
 

cmake/libutils.cmake

@@ -91,7 +91,7 @@ FUNCTION(ADD_STATIC_LIBRARY TARGET)
     ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/archive_output_directory)
 
   IF(ARG_EXCLUDE_FROM_PGO)
-    IF(FPROFILE_GENERATE OR FPROFILE_USE)
+    IF(FPROFILE_GENERATE)
       SET(ARG_EXCLUDE_FROM_ALL TRUE)
     ENDIF()
   ENDIF()

cmake/malloc_utils.cmake

@@ -40,6 +40,10 @@ FUNCTION(WARN_MISSING_SYSTEM_JEMALLOC)
 ENDFUNCTION()
 
 FUNCTION(FIND_MALLOC_LIBRARY library_name)
+  # Skip system tcmalloc, and build the bundled version instead.
+  IF(WITH_TCMALLOC STREQUAL "bundled")
+    RETURN()
+  ENDIF()
   FIND_LIBRARY(MALLOC_LIBRARY ${library_name})
   IF(NOT MALLOC_LIBRARY)
     IF(library_name MATCHES "tcmalloc")
@@ -50,24 +54,24 @@ FUNCTION(FIND_MALLOC_LIBRARY library_name)
     MESSAGE(FATAL_ERROR "Library ${library_name} not found")
   ENDIF()
 
-  STRING_APPEND(CMAKE_C_FLAGS " -fno-builtin-malloc -fno-builtin-calloc")
-  STRING_APPEND(CMAKE_C_FLAGS " -fno-builtin-realloc -fno-builtin-free")
-  STRING_APPEND(CMAKE_CXX_FLAGS " -fno-builtin-malloc -fno-builtin-calloc")
-  STRING_APPEND(CMAKE_CXX_FLAGS " -fno-builtin-realloc -fno-builtin-free")
-
-  STRING_APPEND(CMAKE_EXE_LINKER_FLAGS " -l${library_name}")
-  STRING_APPEND(CMAKE_MODULE_LINKER_FLAGS " -l${library_name}")
-  STRING_APPEND(CMAKE_SHARED_LINKER_FLAGS " -l${library_name}")
-
-  SET(FIND_MALLOC_LIBRARY_FLAG "-l${library_name}" CACHE STRING "" FORCE)
+  # There are some special considerations when using the RedHat gcc toolsets:
+  # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/
+  #   html/developing_c_and_cpp_applications_in_rhel_8/
+  #   additional-toolsets-for-development_developing-applications
+  #
+  # For mysqld (and possibly other binaries),
+  #   we need tcmalloc to be the last library on the link line.
+  # Or more specifically:
+  #   after any library that might pull in libstdc++_nonshared.a
+  # Cmake will analyze target dependencies, and will add -ltcmalloc
+  #   somewhere on the compiler/linker command line accordingly.
+  # There is no way to tell cmake to "link this library last",
+  #   so we modify CMAKE_CXX_LINK_EXECUTABLE instead.
+  # For the original contents of CMAKE_CXX_LINK_EXECUTABLE,
+  #   see e.g. cmake-3.20.1/Modules/CMakeCXXInformation.cmake
+  SET(ORIGINAL_CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}")
+  SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -l${library_name}")
 
-  FOREACH(flag
-      CMAKE_C_FLAGS
-      CMAKE_CXX_FLAGS
-      CMAKE_EXE_LINKER_FLAGS
-      CMAKE_MODULE_LINKER_FLAGS
-      CMAKE_SHARED_LINKER_FLAGS
-      )
-    SET(${flag} "${${flag}}" PARENT_SCOPE)
-  ENDFOREACH()
+  SET(ORIGINAL_CMAKE_CXX_LINK_EXECUTABLE "${ORIGINAL_CMAKE_CXX_LINK_EXECUTABLE}" PARENT_SCOPE)
+  SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE}" PARENT_SCOPE)
 ENDFUNCTION()

cmake/mysql_add_executable.cmake

@@ -83,6 +83,7 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
     EXCLUDE_FROM_ALL   # add target, but do not build it by default
     EXCLUDE_FROM_PGO   # add target, but do not build for PGO
     SKIP_INSTALL       # do not install it
+    SKIP_TCMALLOC      # do not link with tcmalloc
     )
   SET(EXECUTABLE_ONE_VALUE_KW
     ADD_TEST           # add unit test, sets SKIP_INSTALL
@@ -121,6 +122,19 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
   ADD_EXECUTABLE(${target} ${sources})
   TARGET_COMPILE_FEATURES(${target} PUBLIC cxx_std_17)
 
+  IF(TARGET my_tcmalloc)
+    IF(ARG_SKIP_TCMALLOC OR target MATCHES "^rpd")
+      # nothing, use glibc malloc/free
+    ELSE()
+      IF(WITH_VALGRIND)
+        TARGET_LINK_LIBRARIES(${target} my_tcmalloc_debug)
+      ELSE()
+        TARGET_LINK_LIBRARIES(${target} my_tcmalloc)
+      ENDIF()
+      ADD_INSTALL_RPATH(${target} "\$ORIGIN/../${INSTALL_PRIV_LIBDIR}")
+    ENDIF()
+  ENDIF()
+
   SET_PATH_TO_CUSTOM_SSL_FOR_APPLE(${target})
 
   IF(ARG_DEPENDENCIES)
@@ -144,7 +158,7 @@ FUNCTION(MYSQL_ADD_EXECUTABLE target_arg)
   ENDIF()
 
   IF(ARG_EXCLUDE_FROM_PGO)
-    IF(FPROFILE_GENERATE OR FPROFILE_USE)
+    IF(FPROFILE_GENERATE)
       SET(ARG_EXCLUDE_FROM_ALL TRUE)
       SET(ARG_SKIP_INSTALL TRUE)
       UNSET(ARG_ADD_TEST)

extra/abseil/CMakeLists.txt

@@ -21,6 +21,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+DISABLE_MISSING_PROFILE_WARNING()
+
+MY_CHECK_CXX_COMPILER_WARNING("-Wstringop-overflow" HAS_WARN_FLAG)
+IF(HAS_WARN_FLAG)
+  STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_WARN_FLAG}")
+ENDIF()
+
 MY_CHECK_CXX_COMPILER_WARNING("-Wmissing-profile" HAS_MISSING_PROFILE)
 IF(HAS_MISSING_PROFILE)
   STRING_APPEND(CMAKE_CXX_FLAGS " ${HAS_MISSING_PROFILE}")

extra/googletest/googletest-release-1.12.0/googlemock/CMakeLists.txt renamed to extra/googletest/googletest-1.14.0/googlemock/CMakeLists.txt

@@ -36,8 +36,7 @@ endif()
 # as ${gmock_SOURCE_DIR} and to the root binary directory as
 # ${gmock_BINARY_DIR}.
 # Language "C" is required for find_package(Threads).
-cmake_minimum_required(VERSION 3.5)
-cmake_policy(SET CMP0048 NEW)
+cmake_minimum_required(VERSION 3.13)
 project(gmock VERSION ${GOOGLETEST_VERSION} LANGUAGES CXX C)
 
 if (COMMAND set_up_hermetic_build)
@@ -101,18 +100,14 @@ else()
   target_link_libraries(gmock_main PUBLIC gmock)
   set_target_properties(gmock_main PROPERTIES VERSION ${GOOGLETEST_VERSION})
 endif()
-# If the CMake version supports it, attach header directory information
-# to the targets for when we are part of a parent build (ie being pulled
-# in via add_subdirectory() rather than being a standalone build).
-if (DEFINED CMAKE_VERSION AND NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.11")
-  string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
-  target_include_directories(gmock SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-  target_include_directories(gmock_main SYSTEM INTERFACE
-    "$<BUILD_INTERFACE:${dirs}>"
-    "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
-endif()
+
+string(REPLACE ";" "$<SEMICOLON>" dirs "${gmock_build_include_dirs}")
+target_include_directories(gmock SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
+target_include_directories(gmock_main SYSTEM INTERFACE
+  "$<BUILD_INTERFACE:${dirs}>"
+  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
 
 ########################################################################
 #
@@ -136,11 +131,7 @@ if (gmock_build_tests)
   enable_testing()
 
   if (MINGW OR CYGWIN)
-    if (CMAKE_VERSION VERSION_LESS "2.8.12")
-      add_compile_options("-Wa,-mbig-obj")
-    else()
-      add_definitions("-Wa,-mbig-obj")
-    endif()
+    add_compile_options("-Wa,-mbig-obj")
   endif()
 
   ############################################################