Merge pull request #5446 from percona/release-8.0.39-30

PS-9422 Release tasks ticket for PS 8.0.39

Author: adivinho

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,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=37
-MYSQL_VERSION_EXTRA=-29
+MYSQL_VERSION_PATCH=39
+MYSQL_VERSION_EXTRA=-30
 MYSQL_VERSION_STABILITY="LTS"

build-ps/debian/percona-server-server.postinst

@@ -46,22 +46,27 @@ check_exit_status() {
 # If the file has been changed, append telemetry rules to the file
 # If unchanged, install the new apparmor profile
 check_apparmor_files() {
-	if ! diff -q /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/old_apparmor >/dev/null; then
-		sed -i 's:  # Site-specific additions and overrides. See local/README for details.::' /etc/apparmor.d/usr.sbin.mysqld
-                sed -i 's:  #include <local/usr.sbin.mysqld>::' /etc/apparmor.d/usr.sbin.mysqld
-                sed -i '$ s/}//' /etc/apparmor.d/usr.sbin.mysqld
-                echo "# Allow access to PS telemetry directory" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  /usr/local/percona/telemetry/ps/ rw," >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  /usr/local/percona/telemetry/ps/** rw," >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  # Site-specific additions and overrides. See local/README for details." >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "  #include <local/usr.sbin.mysqld>" >> /etc/apparmor.d/usr.sbin.mysqld
-                echo "}" >> /etc/apparmor.d/usr.sbin.mysqld
-                sed -r -i ':a; /^\s*$/ {N;ba}; s/( *\n *){2,}/\n/'  /etc/apparmor.d/usr.sbin.mysqld
-                rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
-        else
-                mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld
-        fi
+	TA_EXISTS=$(grep -c "telemetry" /etc/apparmor.d/usr.sbin.mysqld) 2> /dev/null || true
+	if [ "$TA_EXISTS" -eq 0 ]; then
+		if ! diff -q /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/old_apparmor >/dev/null; then
+			sed -i 's:  # Site-specific additions and overrides. See local/README for details.::' /etc/apparmor.d/usr.sbin.mysqld
+			sed -i 's:  #include <local/usr.sbin.mysqld>::' /etc/apparmor.d/usr.sbin.mysqld
+			sed -i '$ s/}//' /etc/apparmor.d/usr.sbin.mysqld
+			echo "# Allow access to PS telemetry directory" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  /usr/local/percona/telemetry/ps/ rw," >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  /usr/local/percona/telemetry/ps/** rw," >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  # Site-specific additions and overrides. See local/README for details." >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "  #include <local/usr.sbin.mysqld>" >> /etc/apparmor.d/usr.sbin.mysqld
+			echo "}" >> /etc/apparmor.d/usr.sbin.mysqld
+			sed -r -i ':a; /^\s*$/ {N;ba}; s/( *\n *){2,}/\n/'  /etc/apparmor.d/usr.sbin.mysqld
+			rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
+		else
+			mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld
+		fi
+	else
+		rm -f /etc/apparmor.d/usr.sbin.mysqld.in2
+	fi
 }
 
 
@@ -211,9 +216,10 @@ EOF
 		update-alternatives --force --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mysql.cnf" 300
 		if [ -f "/etc/apparmor.d/usr.sbin.mysqld" ]; then
 			check_apparmor_files
+		else
+			mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld 2> /dev/null || true
                 fi
 		rm -f /etc/apparmor.d/old_apparmor
-		mv -f /etc/apparmor.d/usr.sbin.mysqld.in2 /etc/apparmor.d/usr.sbin.mysqld 2> /dev/null || true
 		if aa-status --enabled 2>/dev/null; then
 			apparmor_parser -r -T -W /etc/apparmor.d/usr.sbin.mysqld 2>/dev/null || true
                 fi

build-ps/percona-server-8.0_builder.sh

@@ -511,6 +511,7 @@ install_deps() {
             yum -y install centos-release-stream
             switch_to_vault_repo
             yum -y install gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils gcc-toolset-12-annobin-annocheck gcc-toolset-12-annobin-plugin-gcc
+            yum -y install gcc-toolset-12-libatomic-devel
             if [ x"$ARCH" = "xx86_64" ]; then
                 yum -y remove centos-release-stream
             fi
@@ -519,6 +520,7 @@ install_deps() {
             yum -y install libtirpc-devel
             yum -y install gflags-devel
             yum -y install gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ gcc-toolset-12-binutils gcc-toolset-12-annobin-annocheck gcc-toolset-12-annobin-plugin-gcc
+            yum -y install gcc-toolset-12-libatomic-devel
             if [ x"$ARCH" = "xx86_64" ]; then
                 pushd /opt/rh/gcc-toolset-12/root/usr/lib/gcc/x86_64-redhat-linux/12/plugin/
                 ln -s annobin.so gcc-annobin.so
@@ -557,6 +559,7 @@ install_deps() {
         apt-get -y install curl bison cmake perl libssl-dev libaio-dev libldap2-dev libwrap0-dev gdb unzip gawk
         apt-get -y install libmecab-dev libncurses5-dev libreadline-dev libpam-dev zlib1g-dev libcurl4-openssl-dev
         apt-get -y install libldap2-dev libnuma-dev libjemalloc-dev libc6-dbg valgrind libjson-perl libsasl2-dev patchelf
+        apt-get -y install libatomic1
         if [ x"${DIST}" = xfocal -o x"${DIST}" = xhirsute -o x"${DIST}" = xbullseye -o x"${DIST}" = xjammy -o x"${DIST}" = xbookworm -o x"${DIST}" = xnoble ]; then
             apt-get -y install python3-mysqldb
         else

build-ps/rpm/mysql-5.7-sharedlib-rename.patch

@@ -305,17 +305,19 @@
      ENDIF()
 --- testclients/CMakeLists.txt
 +++ testclients/CMakeLists.txt
-@@ -23,9 +23,9 @@
+@@ -24,11 +24,11 @@
  ADD_WSHADOW_WARNING()
 
  MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.cc COMPONENT Test)
 -TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient extra::rapidjson)
 +TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient extra::rapidjson)
 
  IF(WITH_UNIT_TESTS)
-   MYSQL_ADD_EXECUTABLE(bug25714 bug25714.cc SKIP_INSTALL)
--  TARGET_LINK_LIBRARIES(bug25714 perconaserverclient)
-+  TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
+   MYSQL_ADD_EXECUTABLE(bug25714 bug25714.cc
+     SKIP_INSTALL
+     EXCLUDE_FROM_PGO
+-    LINK_LIBRARIES perconaserverclient)
++    LINK_LIBRARIES mysqlclient)
  ENDIF()
 --- unittest/gunit/group_replication/CMakeLists.txt
 +++ unittest/gunit/group_replication/CMakeLists.txt

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