From 36ea5dffe708237cc1f714feda805cc203fe6d41 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Wed, 14 Dec 2022 18:12:15 +1100 Subject: [PATCH] resolve-stack-dump was moved from server to client (RPM) like where the man page and Debian package put it. --- cmake/cpack_rpm.cmake | 4 ++-- extra/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index a2c2f160963..f757c715c66 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -184,7 +184,7 @@ SETA(CPACK_RPM_client_PACKAGE_PROVIDES "mysql-client" "mytop") SETA(CPACK_RPM_client_PACKAGE_CONFLICTS - "MariaDB-server < 10.6.0") + "MariaDB-server < 11.0.0") SETA(CPACK_RPM_common_PACKAGE_CONFLICTS "MariaDB-server < 10.6.1") @@ -216,7 +216,7 @@ SETA(CPACK_RPM_test_PACKAGE_PROVIDES SETA(CPACK_RPM_server_PACKAGE_REQUIRES "MariaDB-common >= 10.6.1" - "MariaDB-client >= 10.6.1") + "MariaDB-client >= 11.0.0") IF(WITH_WSREP) SETA(CPACK_RPM_server_PACKAGE_REQUIRES diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 5021128ed35..34a83d19e32 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -91,7 +91,7 @@ MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client) TARGET_LINK_LIBRARIES(replace mysys) IF(UNIX) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c COMPONENT Client) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) MYSQL_ADD_EXECUTABLE(mariadb-waitpid mysql_waitpid.c COMPONENT Client)