summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-07-03 11:47:39 +0200
committerSergei Golubchik <serg@mariadb.org>2017-07-05 17:15:59 +0200
commit51d457f371ddf2191f48ec197e8f7364cfa071c8 (patch)
tree13e0382ff712cc6fb4aa37203474a0ce4a02162d /sql
parent291411c96ceb914950731df6c36b32fc83b58acf (diff)
downloadmariadb-git-51d457f371ddf2191f48ec197e8f7364cfa071c8.tar.gz
compilation failures
with -DPLUGIN_PARTITION=NO and -DPLUGIN_PERFSCHEMA=NO
Diffstat (limited to 'sql')
-rw-r--r--sql/mysqld.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 12863b7ae63..871a3140891 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -79,6 +79,10 @@
#include "sql_callback.h"
#include "threadpool.h"
+#ifdef HAVE_OPENSSL
+#include <ssl_compat.h>
+#endif
+
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
#include "../storage/perfschema/pfs_server.h"
#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
@@ -338,13 +342,9 @@ static PSI_thread_key key_thread_handle_con_sockets;
static PSI_thread_key key_thread_handle_shutdown;
#endif /* __WIN__ */
-#ifdef HAVE_OPENSSL
-#include <ssl_compat.h>
-
#ifdef HAVE_OPENSSL10
static PSI_rwlock_key key_rwlock_openssl;
#endif
-#endif
#endif /* HAVE_PSI_INTERFACE */
#ifdef HAVE_NPTL