aboutsummaryrefslogtreecommitdiff
path: root/databases/mysql57-server/files/patch-client_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql57-server/files/patch-client_CMakeLists.txt')
-rw-r--r--databases/mysql57-server/files/patch-client_CMakeLists.txt78
1 files changed, 0 insertions, 78 deletions
diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt
deleted file mode 100644
index e8f06254e2ca..000000000000
--- a/databases/mysql57-server/files/patch-client_CMakeLists.txt
+++ /dev/null
@@ -1,78 +0,0 @@
---- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
-+++ client/CMakeLists.txt
-@@ -38,8 +38,6 @@ ADD_DEFINITIONS(
-
- ## Subdirectory with common client code.
- ADD_SUBDIRECTORY(base)
--## Subdirectory for mysqlpump code.
--ADD_SUBDIRECTORY(dump)
-
- ## We will need libeay32.dll and ssleay32.dll when running client executables.
- COPY_OPENSSL_DLLS(copy_openssl_client)
-@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F
- ENDIF()
-
- 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
-@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
- 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)
-
-@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
-
- 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
-@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
-
- MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
- TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
-+ENDIF()
-
- MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
- TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
-@@ -186,9 +190,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)
-@@ -197,11 +203,6 @@ ENDIF(WIN32)
-
- SET_TARGET_PROPERTIES (
- mysql_plugin
-- mysqlcheck
-- mysqldump
-- mysqlimport
-- mysqlshow
-- mysqlslap
- PROPERTIES HAS_CXX TRUE)
-
- ADD_DEFINITIONS(-DHAVE_DLOPEN)