summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2019-08-17 02:20:18 +0200
committerThomas Deutschmann <whissi@gentoo.org>2019-08-17 02:20:18 +0200
commit9cca68e0575d46455bde1c362c2892b4a4bc97e9 (patch)
treed979b78513f643fea10a227760e4173d8b0a8e49
parentAdd initial Percona-Server v8.0 patch set (diff)
downloadmysql-extras-9cca68e0575d46455bde1c362c2892b4a4bc97e9.tar.gz
mysql-extras-9cca68e0575d46455bde1c362c2892b4a4bc97e9.tar.bz2
mysql-extras-9cca68e0575d46455bde1c362c2892b4a4bc97e9.zip
Fix 20018_all_mysql-5.6.44-fix-libressl-support.patch
Bug: https://bugs.gentoo.org/692124 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
-rw-r--r--20018_all_mysql-5.6.44-fix-libressl-support.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/20018_all_mysql-5.6.44-fix-libressl-support.patch b/20018_all_mysql-5.6.44-fix-libressl-support.patch
index b180677..939459d 100644
--- a/20018_all_mysql-5.6.44-fix-libressl-support.patch
+++ b/20018_all_mysql-5.6.44-fix-libressl-support.patch
@@ -1,6 +1,6 @@
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
-@@ -4358,7 +4358,10 @@ static int init_ssl()
+@@ -4358,7 +4358,11 @@ static int init_ssl()
{
#ifdef HAVE_OPENSSL
#ifndef HAVE_YASSL
@@ -8,10 +8,11 @@
CRYPTO_malloc_init();
+#else /* OPENSSL_VERSION_NUMBER < 0x10100000L */
+ OPENSSL_malloc_init();
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
#endif
ssl_start();
#ifndef EMBEDDED_LIBRARY
-@@ -4372,7 +4375,9 @@ static int init_ssl()
+@@ -4372,7 +4376,9 @@ static int init_ssl()
opt_ssl_cipher, &error,
opt_ssl_crl, opt_ssl_crlpath);
DBUG_PRINT("info",("ssl_acceptor_fd: 0x%lx", (long) ssl_acceptor_fd));