mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 12:10:31 -04:00
ba6bcabbdf
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
53 lines
1.8 KiB
Text
53 lines
1.8 KiB
Text
--- client/CMakeLists.txt.orig 2018-12-20 20:14:03 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -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)
|
|
|
|
+IF(FALSE)
|
|
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})
|
|
ENDIF(UNIX)
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade upgrade/program.cc)
|
|
@@ -56,6 +56,7 @@ ADD_DEPENDENCIES(mysqltest GenError GenC
|
|
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)
|
|
|
|
@@ -68,7 +69,9 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+ENDIF()
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
SET(MYSQLBINLOG_LIB_SOURCES
|
|
${CMAKE_SOURCE_DIR}/strings/decimal.cc
|
|
@@ -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)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc)
|
|
TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient)
|
|
|
|
+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)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|