summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-client_CMakeLists.txt
diff options
context:
space:
mode:
authorMahdi Mokhtari <mmokhi@FreeBSD.org>2019-05-11 14:15:44 +0000
committerMahdi Mokhtari <mmokhi@FreeBSD.org>2019-05-11 14:15:44 +0000
commitba6bcabbdf86e75d6e9d4a13b317ee3fbe7c2097 (patch)
tree3f847f84ea9c50b47d0798b0478a676e419520b7 /databases/mysql80-server/files/patch-client_CMakeLists.txt
parentgames/gzdoom: update to 4.1.1 (diff)
databases/mysql80-{client, server}: Update to latest release 8.0.16
This update includes: Bugfixes: - InnoDB: Undo tablespaces remained unencrypted after enabling undo tablespace encryption at startup. (Bug #29477795) - InnoDB: Problematic macros introduced with undo tablespace DDL support (Bug #29324132, Bug #94243). - InnoDB: Static thread local variables defined at the wrong scope were not released at thread exit. (Bug #29305186) - Memory leaks discovered in the innochecksum (Bug #28917614, Bug #93164). New features: - MySQL C API now supports asynchronous functions for nonblocking communication with the MySQL server. - MySQL now supports a new Chinese collation, utf8mb4_zh_0900_as_cs - CMake now causes the build process to link with the llvm lld linker for Clang if it is available. Security Fix: CVE-2019-2632, CVE-2019-2693, CVE-2019-2694, CVE-2019-2695 and other fixes. More info: https://www.oracle.com/technetwork/security-advisory/cpuapr2019-5072813.html#AppendixMSQL PR: 237399 Reported by: Brent Busby <brent@jfi.uchicago.edu> Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'databases/mysql80-server/files/patch-client_CMakeLists.txt')
-rw-r--r--databases/mysql80-server/files/patch-client_CMakeLists.txt13
1 files changed, 3 insertions, 10 deletions
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt
index ce5a1d0901be..54ba3d72b9f5 100644
--- a/databases/mysql80-server/files/patch-client_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt
@@ -1,16 +1,14 @@
--- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
+++ client/CMakeLists.txt
-@@ -28,16 +28,16 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
+@@ -26,14 +26,14 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil
## Subdirectory with common client code.
ADD_SUBDIRECTORY(base)
-## Subdirectory for mysqlpump code.
-ADD_SUBDIRECTORY(dump)
- INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
-
+IF(FALSE)
- MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc)
+ MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc pattern_matcher.cc ${CMAKE_SOURCE_DIR}/sql/net_ns.cc)
TARGET_LINK_LIBRARIES(mysql mysqlclient)
IF(UNIX)
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
@@ -37,7 +35,7 @@
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
SET(MYSQLBINLOG_LIB_SOURCES
${CMAKE_SOURCE_DIR}/strings/decimal.cc
-@@ -110,16 +113,20 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
+@@ -107,12 +110,15 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
@@ -49,11 +47,6 @@
+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)
-+
- # Bug in /usr/lib/gcc-snapshot/lib/libstdc++.so ??
- IF(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL "9.0.0")
- TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup -static-libstdc++)
- ENDIF()
+ENDIF()
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".