summaryrefslogtreecommitdiff
path: root/mysys_ssl
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-10-22 08:26:28 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2020-10-22 08:26:28 +0300
commite3d692aa092a76415ce1ce0e9662338873d84abb (patch)
treec6c7fafc561b589f82ed3a0afd696822fd52962d /mysys_ssl
parent88d22f0e65192ca1b1e69b46661ce57ce19dbaa4 (diff)
parent620ea816adeceaba7c875679ab8505f4c07a22b8 (diff)
downloadmariadb-git-e3d692aa092a76415ce1ce0e9662338873d84abb.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'mysys_ssl')
-rw-r--r--mysys_ssl/openssl.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c
index e0f3d646ca9..b38d4ba309c 100644
--- a/mysys_ssl/openssl.c
+++ b/mysys_ssl/openssl.c
@@ -15,7 +15,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
#include <my_global.h>
-#include <ssl_compat.h>
/*
The check is only done for OpenSSL 1.1.x.
@@ -25,12 +24,14 @@
*/
#ifndef HAVE_OPENSSL11
+#include <ssl_compat.h>
int check_openssl_compatibility()
{
return 0;
}
#else
#include <openssl/evp.h>
+#include <ssl_compat.h>
static uint testing;
size_t alloc_size, alloc_count;