forked from Lainports/opnsense-ports
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,
|