Skip to content

Commit

Permalink
resolve-stack-dump was moved from server to client (RPM)
Browse files Browse the repository at this point in the history
like where the man page and Debian package put it.
  • Loading branch information
grooverdan authored and vuvova committed Feb 12, 2023
1 parent c6f0814 commit 36ea5df
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cmake/cpack_rpm.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion extra/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 36ea5df

Please sign in to comment.