forked from Lainports/freebsd-ports
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
20 lines
758 B
C++
20 lines
758 B
C++
--- sql/mysqld.cc.orig 2018-10-07 08:44:22 UTC
|
|
+++ sql/mysqld.cc
|
|
@@ -4493,7 +4493,7 @@ static int warn_self_signed_ca() {
|
|
|
|
static PSI_memory_key key_memory_openssl = PSI_NOT_INSTRUMENTED;
|
|
|
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
|
|
#define FILE_LINE_ARGS
|
|
#else
|
|
#define FILE_LINE_ARGS , const char *, int
|
|
@@ -4530,7 +4530,7 @@ static void init_ssl() {
|
|
|
|
static void init_ssl() {
|
|
#ifdef HAVE_OPENSSL
|
|
-#if !defined(HAVE_WOLFSSL) && !defined(__sun)
|
|
+#if !defined(HAVE_WOLFSSL) && !defined(LIBRESSL_VERSION_NUMBER) && !defined(__sun)
|
|
#if defined(HAVE_PSI_MEMORY_INTERFACE)
|
|
static PSI_memory_info all_openssl_memory[] = {
|
|
{&key_memory_openssl, "openssl_malloc", 0, 0,
|