Merge pull request #4843 from adivinho/release-8.0.29-21

Release 8.0.29 21

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

@@ -43,11 +43,14 @@ usr/lib/mysqlrouter/private/libmysqlharness.so.1
 usr/lib/mysqlrouter/private/libmysqlharness_stdx.so.1
 usr/lib/mysqlrouter/private/libmysqlharness_tls.so.1
 usr/lib/mysqlrouter/private/libmysqlrouter.so.1
+usr/lib/mysqlrouter/private/libmysqlrouter_connection_pool.so.1
 usr/lib/mysqlrouter/private/libmysqlrouter_http.so.1
 usr/lib/mysqlrouter/private/libmysqlrouter_http_auth_backend.so.1
 usr/lib/mysqlrouter/private/libmysqlrouter_http_auth_realm.so.1
 usr/lib/mysqlrouter/private/libmysqlrouter_io_component.so.1
-usr/lib/mysqlrouter/private/libmysqlrouter_io_component.so.1
+usr/lib/mysqlrouter/private/libmysqlrouter_metadata_cache.so.1
+usr/lib/mysqlrouter/private/libmysqlrouter_mysqlxmessages.so.1
+usr/lib/mysqlrouter/private/libmysqlrouter_routing.so.1
 
 usr/share/mysqlrouter/docs/sample_mysqlrouter.conf
 usr/share/mysqlrouter/mysqlrouter-systemd-start

build-ps/debian/rules

@@ -204,6 +204,9 @@ override_dh_strip:
 	dh_strip --dbg-package=percona-server-dbg
 	dh_strip -Xlibprotobuf-lite
 
+override_dh_shlibdeps:
+	dh_shlibdeps -Lpercona-server-server -l/usr/lib/mysql/private --dpkg-shlibdeps-params=--ignore-missing-info
+
 override_dh_installinit:
 	@echo "RULES.$@"
 #	dh_apparmor -ppercona-server-server --profile-name=usr.sbin.mysqld

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

@@ -436,13 +436,14 @@ install_deps() {
         fi
         if [ "x${RHEL}" = "x8" ]; then
             yum -y install centos-release-stream
-            yum -y install git gcc-toolset-10-gcc gcc-toolset-10-gcc-c++ gcc-toolset-10-annobin
-            source /opt/rh/gcc-toolset-10/enable
+            yum -y install git gcc-toolset-11-gcc gcc-toolset-11-gcc-c++ gcc-toolset-11-annobin-plugin-gcc
+            source /opt/rh/gcc-toolset-11/enable
         fi
         if [ "x${RHEL}" = "x7" ]; then
-            yum -y install devtoolset-10
+            yum -y install devtoolset-11
+            yum -y install devtoolset-11-annobin-plugin-gcc
             yum -y install cyrus-sasl-gssapi cyrus-sasl-gs2 cyrus-sasl-md5 cyrus-sasl-plain
-            source /opt/rh/devtoolset-10/enable
+            source /opt/rh/devtoolset-11/enable
         fi
 	 if [ "x${RHEL}" = "x6" ]; then
             source /opt/rh/devtoolset-8/enable
@@ -456,16 +457,15 @@ install_deps() {
             yum -y install libevent-devel
         fi
         if [ "x$RHEL" = "x7" ]; then
-            yum -y --enablerepo=centos-sclo-rh-testing install devtoolset-10-gcc-c++ devtoolset-10-binutils devtoolset-10-valgrind devtoolset-10-valgrind-devel devtoolset-10-libatomic-devel
-            yum -y --enablerepo=centos-sclo-rh-testing install devtoolset-10-libasan-devel devtoolset-10-libubsan-devel
+            yum -y --enablerepo=centos-sclo-rh-testing install devtoolset-11-gcc-c++ devtoolset-11-binutils devtoolset-11-valgrind devtoolset-11-valgrind-devel devtoolset-11-libatomic-devel
+            yum -y --enablerepo=centos-sclo-rh-testing install devtoolset-11-libasan-devel devtoolset-11-libubsan-devel
             rm -f /usr/bin/cmake
 	    cp -p /usr/bin/cmake3 /usr/bin/cmake
         fi
         if [ "x$RHEL" = "x8" ]; then
             yum -y install centos-release-stream
-            yum -y install gcc-toolset-10-gcc-c++ gcc-toolset-10-binutils
-            yum -y install gcc-toolset-10-valgrind gcc-toolset-10-valgrind-devel gcc-toolset-10-libatomic-devel
-            yum -y install gcc-toolset-10-libasan-devel gcc-toolset-10-libubsan-devel
+            yum -y install gcc-toolset-11-binutils gcc-toolset-11-valgrind gcc-toolset-11-valgrind-devel gcc-toolset-11-libatomic-devel
+            yum -y install gcc-toolset-11-libasan-devel gcc-toolset-11-libubsan-devel
             yum -y remove centos-release-stream
         fi
     else
@@ -723,7 +723,7 @@ build_rpm(){
         source /opt/rh/devtoolset-8/enable
     fi
     if [ "x${RHEL}" = "x7" ]; then
-        source /opt/rh/devtoolset-10/enable
+        source /opt/rh/devtoolset-11/enable
     fi
     if [ "x${RHEL}" = "x8" ]; then
         source /opt/rh/gcc-toolset-10/enable
@@ -738,7 +738,7 @@ build_rpm(){
         sudo ln -s /opt/rh/devtoolset-8/root/usr/bin/strip /usr/bin/strip
     fi
     if [ "x${RHEL}" = "x7" ]; then
-        source /opt/rh/devtoolset-10/enable
+        source /opt/rh/devtoolset-11/enable
     fi
     if [ "x${RHEL}" = "x8" ]; then
         source /opt/rh/gcc-toolset-10/enable
@@ -912,7 +912,7 @@ build_tarball(){
           source /opt/rh/devtoolset-8/enable
       fi
       if [ "x${RHEL}" = "x7" ]; then
-          source /opt/rh/devtoolset-10/enable
+          source /opt/rh/devtoolset-11/enable
       fi
       if [ "x${RHEL}" = "x8" ]; then
           source /opt/rh/gcc-toolset-10/enable
@@ -1001,21 +1001,21 @@ RPM_RELEASE=1
 DEB_RELEASE=1
 DEBUG=0
 REVISION=0
-BRANCH="release-8.0.27-18"
+BRANCH="release-8.0.29-21"
 RPM_RELEASE=1
 DEB_RELEASE=1
 MECAB_INSTALL_DIR="${WORKDIR}/mecab-install"
 REPO="https://github.com/percona/percona-server.git"
 PRODUCT=Percona-Server-8.0
 MYSQL_VERSION_MAJOR=8
 MYSQL_VERSION_MINOR=0
-MYSQL_VERSION_PATCH=27
-MYSQL_VERSION_EXTRA=-18
-PRODUCT_FULL=Percona-Server-8.0.27
+MYSQL_VERSION_PATCH=29
+MYSQL_VERSION_EXTRA=-21
+PRODUCT_FULL=Percona-Server-8.0.29
 BOOST_PACKAGE_NAME=boost_1_77_0
 BUILD_TOKUDB_TOKUBACKUP=0
-PERCONAFT_BRANCH=Percona-Server-8.0.27-18
-TOKUBACKUP_BRANCH=Percona-Server-8.0.27-18
+PERCONAFT_BRANCH=Percona-Server-8.0.29-21
+TOKUBACKUP_BRANCH=Percona-Server-8.0.29-21
 parse_arguments PICK-ARGS-FROM-ARGV "$@"
 
 check_workdir

build-ps/percona-server.spec

@@ -1395,11 +1395,15 @@ fi
 %{_libdir}/mysqlrouter/private/libmysqlharness_stdx.so.*
 %{_libdir}/mysqlrouter/private/libmysqlharness_tls.so.*
 %{_libdir}/mysqlrouter/private/libmysqlrouter.so.*
+%{_libdir}/mysqlrouter/private/libmysqlrouter_connection_pool.so.*
 %{_libdir}/mysqlrouter/private/libmysqlrouter_http.so.*
 %{_libdir}/mysqlrouter/private/libmysqlrouter_http_auth_backend.so.*
 %{_libdir}/mysqlrouter/private/libmysqlrouter_http_auth_realm.so.*
 %{_libdir}/mysqlrouter/private/libprotobuf-lite.so.*
 %{_libdir}/mysqlrouter/private/libmysqlrouter_io_component.so.1
+%{_libdir}/mysqlrouter/private/libmysqlrouter_metadata_cache.so.*
+%{_libdir}/mysqlrouter/private/libmysqlrouter_mysqlxmessages.so.*
+%{_libdir}/mysqlrouter/private/libmysqlrouter_routing.so.*
 %dir %{_libdir}/mysqlrouter
 %dir %{_libdir}/mysqlrouter/private
 %{_libdir}/mysqlrouter/*.so

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

@@ -220,37 +220,6 @@
    ${MYSQLX_CLIENT_FULL_LIB}
    ${MYSQLX_PROTOCOL_FULL_LIB}
    ${PROTOBUF_LIBRARY}
---- router/src/metadata_cache/CMakeLists.txt
-+++ router/src/metadata_cache/CMakeLists.txt
-@@ -71,7 +71,7 @@ IF(WITH_UNIT_TESTS AND GMOCK_FOUND)
-   ADD_LIBRARY(metadata_cache_static STATIC ${METADATA_CACHE_SOURCES})
-   TARGET_LINK_LIBRARIES(metadata_cache_static
-     router_lib
--    perconaserverclient
-+    mysqlclient
-     mysqlxmessages_lite
-     ${PROTOBUF_LITE_LIBRARY}
-     )
---- router/src/metadata_cache/tests/CMakeLists.txt
-+++ router/src/metadata_cache/tests/CMakeLists.txt
-@@ -56,7 +56,7 @@
-   TARGET_LINK_LIBRARIES(metadata_cache_tests
-     router_lib
-     metadata_cache
--    perconaserverclient
-+    mysqlclient
-     mysqlxclient_lite
-     mysqlxmessages_lite
-     ${PROTOBUF_LITE_LIBRARY}
-@@ -69,7 +69,7 @@
-   ADD_LIBRARY(metadata_cache_tests SHARED ${METADATA_CACHE_TESTS_HELPER})
-   TARGET_LINK_LIBRARIES(metadata_cache_tests
-     router_lib
--    perconaserverclient
-+    mysqlclient
-     mysqlxclient_lite
-     mysqlxmessages_lite
-     ${PROTOBUF_LITE_LIBRARY}
 --- router/src/router/src/CMakeLists.txt
 +++ router/src/router/src/CMakeLists.txt
 @@ -71,7 +71,7 @@ TARGET_LINK_LIBRARIES(router_lib
@@ -568,3 +537,42 @@
    gunit_small)
 
  IF (WITH_CS_PROTOBUF)
+
+--- router/src/router/tests/CMakeLists.txt	2022-07-26 08:37:14.834824576 +0000
++++ router/src/router/tests/CMakeLists.txt	2022-07-26 08:38:26.484931770 +0000
+@@ -130,7 +130,7 @@
+ ADD_HARNESS_TEST_FILE(test_mysql_session.cc
+   MODULE ${TEST_MODULE}
+   LIB_DEPENDS
+-    test-helpers perconaserverclient
++    test-helpers mysqlclient
+   EXTRA_SOURCES
+     ../src/common/mysql_session.cc
+     ../src/common/log_filter.cc
+@@ -146,7 +146,7 @@
+ ADD_HARNESS_TEST_FILE(test_metadata_check.cc
+   MODULE ${TEST_MODULE}
+   LIB_DEPENDS
+-    test-helpers perconaserverclient
++    test-helpers mysqlclient
+   EXTRA_SOURCES
+     ../src/common/mysql_session.cc
+     ../src/common/log_filter.cc
+@@ -168,7 +168,7 @@
+ ADD_HARNESS_TEST_FILE(test_cluster_metadata.cc
+   MODULE ${TEST_MODULE}
+   LIB_DEPENDS
+-    test-helpers perconaserverclient
++    test-helpers mysqlclient
+   EXTRA_SOURCES
+     ../src/common/mysql_session.cc
+     ../src/common/log_filter.cc
+@@ -190,7 +190,7 @@
+ ADD_HARNESS_TEST_FILE(test_windows_service.cc
+   MODULE ${TEST_MODULE}
+   LIB_DEPENDS
+-    test-helpers perconaserverclient
++    test-helpers mysqlclient
+   EXTRA_SOURCES
+     ../src/windows/main-windows.cc
+     ../src/windows/nt_servc.cc