Skip to content

Commit a2188eb

Browse files
authored
Merge pull request #5430 from adivinho/release-8.0.39-30
RM-1420 PS-8.0.39-30
2 parents 9bb16bb + 15637a9 commit a2188eb

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,17 +305,19 @@
305305
ENDIF()
306306
--- testclients/CMakeLists.txt
307307
+++ testclients/CMakeLists.txt
308-
@@ -23,9 +23,9 @@
308+
@@ -24,11 +24,11 @@
309309
ADD_WSHADOW_WARNING()
310310

311311
MYSQL_ADD_EXECUTABLE(mysql_client_test mysql_client_test.cc COMPONENT Test)
312312
-TARGET_LINK_LIBRARIES(mysql_client_test perconaserverclient extra::rapidjson)
313313
+TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient extra::rapidjson)
314314

315315
IF(WITH_UNIT_TESTS)
316-
MYSQL_ADD_EXECUTABLE(bug25714 bug25714.cc SKIP_INSTALL)
317-
- TARGET_LINK_LIBRARIES(bug25714 perconaserverclient)
318-
+ TARGET_LINK_LIBRARIES(bug25714 mysqlclient)
316+
MYSQL_ADD_EXECUTABLE(bug25714 bug25714.cc
317+
SKIP_INSTALL
318+
EXCLUDE_FROM_PGO
319+
- LINK_LIBRARIES perconaserverclient)
320+
+ LINK_LIBRARIES mysqlclient)
319321
ENDIF()
320322
--- unittest/gunit/group_replication/CMakeLists.txt
321323
+++ unittest/gunit/group_replication/CMakeLists.txt

0 commit comments

Comments
 (0)