mirror of
https://git.freebsd.org/ports.git
synced 2025-05-17 09:33:11 -04:00
3c607881a6
PR: 241534 Submitted by: Teemu Ollakka <teemu.ollakka@galeracluster.com> Relnotes: http://releases.galeracluster.com/mysql-wsrep-5.7.28-25.20/release-notes-mysql-wsrep-5.7.28-25.20.txt
75 lines
2.3 KiB
Text
75 lines
2.3 KiB
Text
--- client/CMakeLists.txt.orig 2019-10-21 05:21:41 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -38,17 +38,17 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
|
|
|
## Subdirectory with common client code.
|
|
ADD_SUBDIRECTORY(base)
|
|
-## Subdirectory for mysqlpump code.
|
|
-ADD_SUBDIRECTORY(dump)
|
|
|
|
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
|
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
|
|
TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
@@ -69,6 +69,7 @@ ADD_DEPENDENCIES(mysqltest GenError)
|
|
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core)
|
|
|
|
@@ -81,10 +82,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
ADD_COMPILE_FLAGS(
|
|
mysqlbinlog.cc
|
|
@@ -101,6 +104,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_config_editor ${FORCE_SSL_SOLARIS} mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
@@ -116,9 +120,11 @@ IF(UNIX AND NOT WITHOUT_SERVER)
|
|
ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema)
|
|
ENDIF()
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl)
|
|
SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|
|
@@ -127,11 +133,6 @@ ENDIF(WIN32)
|
|
|
|
SET_TARGET_PROPERTIES (
|
|
mysql_plugin
|
|
- mysqlcheck
|
|
- mysqldump
|
|
- mysqlimport
|
|
- mysqlshow
|
|
- mysqlslap
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|
|
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|