553f6ced0d
This update fixes bugs like CVE-2018-2696, CVE-2018-2562, CVE-2018-2640, CVE-2018-2668, CVE-2017-3737 (and more) in MySQL protocol by upstream. Delete local patches (CMake plugin macros) that are merged by upstream. PR: 225195 Sponsored by: Netzkommune GmbH
54 lines
1.6 KiB
Text
54 lines
1.6 KiB
Text
--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -47,6 +47,7 @@ IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
|
|
ENDIF(UNIX)
|
|
|
|
+IF(FALSE)
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade
|
|
upgrade/program.cc
|
|
@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS(
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
|
|
ADD_DEPENDENCIES(mysqltest GenError)
|
|
+ENDIF()
|
|
|
|
ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc)
|
|
@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
ADD_COMPILE_FLAGS(
|
|
@@ -98,8 +104,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
|
|
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
+ENDIF()
|
|
|
|
IF(UNIX AND NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_install_db
|
|
@@ -122,7 +130,6 @@ IF(WIN32)
|
|
ENDIF(WIN32)
|
|
|
|
SET_TARGET_PROPERTIES (
|
|
- mysql_plugin
|
|
mysqlcheck
|
|
mysqldump
|
|
mysqlimport
|