Merge pull request #5430 from adivinho/release-8.0.39-30

RM-1420 PS-8.0.39-30
percona · Sep 16, 2024 · a2188eb · a2188eb
2 parents 9bb16bb + 15637a9
commit a2188eb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/build-ps/rpm/mysql-5.7-sharedlib-rename.patch b/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