Merge pull request #5245 from percona/release-8.0.36-28

PS-9104 Release tasks for PS-8.0.36

.gitattributes

@@ -39,12 +39,3 @@
 /strings/uca_data.h !filter
 /internal/meb/meb/mysqloption_list.cpp !filter
 
-# Some NDB source is currently exempt
-/storage/ndb/clusterj/** !filter
-/storage/ndb/include/** !filter
-/storage/ndb/memcache/** !filter
-/storage/ndb/ndbapi-examples/** !filter
-/storage/ndb/nodejs/** !filter
-/storage/ndb/src/** !filter
-/storage/ndb/test/** !filter
-/storage/ndb/tools/** !filter

CMakeLists.txt

@@ -807,7 +807,7 @@ IF(WITH_DEFAULT_COMPILER_OPTIONS)
 ENDIF()
 
 # Assume, for now at least, that we want build-id for all kinds of Linux builds.
-IF(LINUX)
+IF(LINUX AND NOT LINUX_ALPINE)
   OPTION(WITH_BUILD_ID "Add --build-id=sha1 to all executables." ON)
   IF(WITH_BUILD_ID)
     SET(HAVE_BUILD_ID_SUPPORT 1)
@@ -2545,15 +2545,6 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
   SET(MYSQL_DOCS_LOCATION "" CACHE PATH
     "Location from where documentation is copied")
   MARK_AS_ADVANCED(MYSQL_DOCS_LOCATION)
-  INSTALL(DIRECTORY Docs/ DESTINATION ${INSTALL_DOCDIR}
-    COMPONENT Documentation
-    PATTERN "Makefile.*" EXCLUDE
-    PATTERN "glibc*" EXCLUDE
-    PATTERN "linuxthreads.txt" EXCLUDE
-    PATTERN "myisam.txt" EXCLUDE
-    PATTERN "sp-imp-spec.txt" EXCLUDE
-    PATTERN "README.build" EXCLUDE
-  )
 ENDIF()
 
 # Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,

LICENSE

@@ -1,25 +1,25 @@
 Licensing Information User Manual
 
-MySQL 8.0.35 Community
+MySQL 8.0.36 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.35 Community.
+   MySQL 8.0.36 Community.
 
-   Last updated: August 2023
+   Last updated: October 2023
 
 Licensing Information
 
-   This release of MySQL 8.0.35 Community is brought to you by the MySQL
+   This release of MySQL 8.0.36 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.35 Community is distributed with certain
+   This distribution of MySQL 8.0.36 Community is 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
    the license documentation. Without limiting your rights under the

MYSQL_VERSION

@@ -1,5 +1,5 @@
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=35
-MYSQL_VERSION_EXTRA=-27
+MYSQL_VERSION_PATCH=36
+MYSQL_VERSION_EXTRA=-28
 MYSQL_VERSION_STABILITY="LTS"

README.MySQL

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

build-ps/build-binary.sh

@@ -111,7 +111,6 @@ do
         shift
         FIPSMODE=1
         WITH_SSL="OFF"
-        BUILD_COMMENT="${BUILD_COMMENT:-}-pro"
         ;;
     --with-zenfs )
         shift
@@ -238,8 +237,9 @@ if [ -n "$(command -v rpm)" ]; then
   if test "x$CMAKE_BUILD_TYPE" = "xDebug"
   then
     COMMON_FLAGS=`echo " ${COMMON_FLAGS} " | \
-              sed -e 's/ -O[0-9]* / /' \
-                  -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
+              sed -e 's/-Wall/-Wall -Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=array-bounds -Wno-error=alloc-size-larger-than= -Wno-error=stringop-truncation/' \
+              #    -e 's/ -O[0-9]* / /' \
+                  -e 's/-Wp,-D_FORTIFY_SOURCE=2//' \
                   -e 's/ -unroll2 / /' \
                   -e 's/ -ip / /' \
                   -e 's/^ //' \

build-ps/debian/percona-mysql-router.preinst

@@ -27,7 +27,7 @@ case "$1" in
     set -e
 
     if [ -x /etc/init.d/mysqlrouter ]; then
-      invoke-rc.d mysqlrouter stop || exit $?
+      invoke-rc.d --skip-systemd-native mysqlrouter stop || exit $?
     fi
 
     addgroup --quiet --system mysqlrouter

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

@@ -174,6 +174,14 @@ EOF
 		fi
 		set +e
 
+	else
+		# If the existing config file is a proper file, we back it up
+		if [ -f "/etc/mysql/my.cnf" ] && [ ! -L "/etc/mysql/my.cnf" ]; then
+			cp /etc/mysql/my.cnf /etc/mysql/my.cnf.bak
+			echo "WARNING: /etc/mysql/my.cnf moved to /etc/mysql/my.cnf.bak"
+			echo "Please use etc/mysql/mysql.conf.d for any custom configuration settings"
+		fi
+		update-alternatives --force --install /etc/mysql/my.cnf my.cnf "/etc/mysql/mysql.cnf" 300
 	fi
 
 	;;

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

@@ -28,7 +28,7 @@ place_upstart_job_back () {
 }
 
 get_pcount () {
-	PSCOUNT=$(ps -C mysqld --no-headers | wc -l)
+	PSCOUNT=$(ps -o cmd --no-headers --ppid 1 | grep "mysqld" | wc -l)
 	echo "${PSCOUNT}"
 }
 

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 get_pcount () {
-	PSCOUNT=$(ps -C mysqld --no-headers | wc -l)
+	PSCOUNT=$(ps -o cmd --no-headers --ppid 1 | grep "mysqld" | wc -l)
 	echo "${PSCOUNT}"
 }
 

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

@@ -438,7 +438,7 @@ install_deps() {
         fi
         if [ x"$ARCH" = "xx86_64" ]; then
             if [ "${RHEL}" -lt 9 ]; then
-                add_percona_yum_repo
+                # add_percona_yum_repo
                 yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm
                 percona-release enable tools testing
                 percona-release enable tools experimental
@@ -679,6 +679,8 @@ build_srpm(){
         -e "s:percona-mysql-router-devel =:percona-mysql-router-devel-pro =:g" \
         -e "s:percona-server-rocksdb$:percona-server-rocksdb-pro:g" \
         -e "s:percona-server-test$:percona-server-test-pro:g" \
+        -e "s:percona-server-shared$:percona-server-shared-pro:g" \
+        -e "s:percona-server-shared :percona-server-shared-pro :g" \
         -e "s:Conflicts\:      percona-server-server-pro:Conflicts\:      percona-server-server:g" \
         -e "s:Conflicts\:      percona-server-client-pro:Conflicts\:      percona-server-client:g" \
         -e "s:Conflicts\:      percona-server-test-pro:Conflicts\:      percona-server-test:g" \
@@ -687,6 +689,7 @@ build_srpm(){
         -e "s:Conflicts\:     percona-mysql-router-pro:Conflicts\:     percona-mysql-router:g" \
         -e "s:Conflicts\:      percona-mysql-router-devel-pro:Conflicts\:      percona-mysql-router-devel:g" \
         -e "s:Conflicts\:      percona-server-test-pro:Conflicts\:      percona-server-test:g" \
+        -e "s:Conflicts\:      percona-server-shared-pro:Conflicts\:      percona-server-shared:g" \
         -e "s:Name\:           percona-server:Name\:           percona-server-pro:g" \
         percona-server.spec
     fi
@@ -728,7 +731,8 @@ build_srpm(){
 build_mecab_lib(){
     ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
     MECAB_TARBAL="mecab-0.996.tar.gz"
-    MECAB_LINK="http://jenkins.percona.com/downloads/mecab/${MECAB_TARBAL}"
+    #MECAB_LINK="http://jenkins.percona.com/downloads/mecab/${MECAB_TARBAL}"
+    MECAB_LINK="https://downloads.percona.com/downloads/TESTING/issue-CUSTO83/${MECAB_TARBAL}"
     MECAB_DIR="${WORKDIR}/${MECAB_TARBAL%.tar.gz}"
     MECAB_INSTALL_DIR="${WORKDIR}/mecab-install"
     rm -f ${MECAB_TARBAL}
@@ -759,7 +763,8 @@ build_mecab_lib(){
 build_mecab_dict(){
     ARCH=$(echo $(uname -m) | sed -e 's:i686:i386:g')
     MECAB_IPADIC_TARBAL="mecab-ipadic-2.7.0-20070801.tar.gz"
-    MECAB_IPADIC_LINK="http://jenkins.percona.com/downloads/mecab/${MECAB_IPADIC_TARBAL}"
+    #MECAB_IPADIC_LINK="http://jenkins.percona.com/downloads/mecab/${MECAB_IPADIC_TARBAL}"
+    MECAB_IPADIC_LINK="https://downloads.percona.com/downloads/TESTING/issue-CUSTO83/${MECAB_IPADIC_TARBAL}"
     MECAB_IPADIC_DIR="${WORKDIR}/${MECAB_IPADIC_TARBAL%.tar.gz}"
     rm -f ${MECAB_IPADIC_TARBAL}
     rm -rf ${MECAB_IPADIC_DIR}
@@ -1059,15 +1064,19 @@ build_deb(){
     fi
     dch -b -m -D "$DEBIAN_VERSION" --force-distribution -v "${VERSION}-${RELEASE}-${DEB_RELEASE}.${DEBIAN_VERSION}" 'Update distribution'
 
+    postfix=""
+    if [ x"${FIPSMODE}" == x1 ]; then
+        postfix="-pro"
+    fi
     cd debian/
     wget https://raw.githubusercontent.com/Percona-Lab/telemetry-agent/phase-0/call-home.sh
-    sed -i 's:exit 0::' percona-server-server.postinst
-    echo "cat <<'CALLHOME' > /tmp/call-home.sh" >> percona-server-server.postinst
-    cat call-home.sh >> percona-server-server.postinst
-    echo "CALLHOME" >> percona-server-server.postinst
-    echo "bash +x /tmp/call-home.sh -f \"PRODUCT_FAMILY_PS\" -v \"${VERSION}-${RELEASE}-${DEB_RELEASE}\" -d \"PACKAGE\" &>/dev/null || :" >> percona-server-server.postinst
-    echo "rm -rf /tmp/call-home.sh" >> percona-server-server.postinst
-    echo "exit 0" >> percona-server-server.postinst
+    sed -i 's:exit 0::' percona-server-server"${postfix}".postinst
+    echo "cat <<'CALLHOME' > /tmp/call-home.sh" >> percona-server-server"${postfix}".postinst
+    cat call-home.sh >> percona-server-server"${postfix}".postinst
+    echo "CALLHOME" >> percona-server-server"${postfix}".postinst
+    echo "bash +x /tmp/call-home.sh -f \"PRODUCT_FAMILY_PS\" -v \"${VERSION}-${RELEASE}-${DEB_RELEASE}\" -d \"PACKAGE\" &>/dev/null || :" >> percona-server-server"${postfix}".postinst
+    echo "rm -rf /tmp/call-home.sh" >> percona-server-server"${postfix}".postinst
+    echo "exit 0" >> percona-server-server"${postfix}".postinst
     rm -f call-home.sh
     cd ../
 
@@ -1132,6 +1141,9 @@ build_tarball(){
       if [ "x${RHEL}" = "x8" ]; then
           source /opt/rh/gcc-toolset-10/enable
       fi
+      if [ "x${RHEL}" = "x9" ]; then
+          . /opt/rh/gcc-toolset-12/enable
+      fi
     fi
     #
 

build-ps/percona-server.spec

@@ -396,6 +396,7 @@ Provides:       mysql-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      mariadb-libs
 Obsoletes:      mysql-connector-c-shared < 6.2
 Obsoletes:      mysql-libs < %{version}-%{release}
+Conflicts:      percona-server-shared-pro
 Provides:       mysql-shared
 %ifarch x86_64
 %if 0%{?rhel} < 9
@@ -515,7 +516,7 @@ fi
   rm -rf percona-compatlib
   mkdir percona-compatlib
   pushd percona-compatlib
-  wget %{compatsrc}
+  wget --no-check-certificate %{compatsrc}
 %if 0%{?rhel} > 6
   rpm2cpio Percona-Server-shared-%{compat_prefix}-%{compatver}-rel%{percona_compatver}.1.el7.x86_64.rpm | cpio --extract --make-directories --verbose
 %else
@@ -850,6 +851,17 @@ if [ ! -d %{_datadir}/mysql ] && [ ! -L %{_datadir}/mysql ]; then
     ln -s %{_datadir}/percona-server %{_datadir}/mysql
 fi
 
+%if 0%{?rhel} >= 9
+if [ -f /usr/lib/systemd/system/mysqld.service ]; then
+  if [ ! -e /etc/systemd/system/mysql.service ] && [ -d /etc/systemd/system ]; then
+    ln -s /usr/lib/systemd/system/mysqld.service /etc/systemd/system/mysql.service
+  fi
+  if [ ! -e /etc/systemd/system/multi-user.target.wants/mysqld.service ] && [ -d /etc/systemd/system/multi-user.target.wants ]; then
+    ln -s /usr/lib/systemd/system/mysqld.service /etc/systemd/system/multi-user.target.wants/mysqld.service
+  fi
+fi
+%endif
+
 %post -n percona-server-shared -p /sbin/ldconfig
 
 %postun -n percona-server-shared -p /sbin/ldconfig

cmake/build_configurations/compiler_options.cmake

@@ -65,7 +65,8 @@ IF(UNIX)
   ENDIF()
 
   # Faster TLS model
-  IF(MY_COMPILER_IS_GNU_OR_CLANG AND NOT SOLARIS AND NOT LINUX_RHEL6)
+  IF(MY_COMPILER_IS_GNU_OR_CLANG
+      AND NOT SOLARIS AND NOT LINUX_RHEL6 AND NOT LINUX_ALPINE)
     STRING_APPEND(COMMON_C_FLAGS     " -ftls-model=initial-exec")
     STRING_APPEND(COMMON_CXX_FLAGS   " -ftls-model=initial-exec")
   ENDIF()

cmake/compile_flags.cmake

@@ -161,3 +161,10 @@ FUNCTION(CHECK_ALTERNATIVE_LINKER LINKER OUTPUT_RESULT)
 
   CMAKE_POP_CHECK_STATE()
 ENDFUNCTION(CHECK_ALTERNATIVE_LINKER)
+
+FUNCTION(EXCLUDE_FROM_MSVC_PGO TARGET_LIB)
+  # Exclude archive from PGO on Windows to avoid linker error LNK1248
+  IF(MSVC AND ((FPROFILE_GENERATE OR FPROFILE_USE)))
+    TARGET_COMPILE_OPTIONS(${TARGET_LIB} PRIVATE /GL-)
+  ENDIF()
+ENDFUNCTION(EXCLUDE_FROM_MSVC_PGO)