Merge branch 'mysql-8.0' into mysql-trunk

mysql · Mar 1, 2018 · 7bf9c57 · 7bf9c57
2 parents 340b516 + 14906d5
commit 7bf9c57
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 18 deletions.
diff --git a/include/violite.h b/include/violite.h
@@ -226,10 +226,13 @@ extern "C" {
 /* Set wolfSSL to use same type as MySQL do for socket handles */
 typedef my_socket WOLFSSL_SOCKET_T;
 #define WOLFSSL_SOCKET_T_DEFINED
+
+// clang-format off
+#include <wolfssl_fix_namespace_pollution_pre.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
+// clang-format on
 
 enum enum_ssl_init_error {
   SSL_INITERR_NOERROR = 0,

diff --git a/mysys_ssl/crypt_genhash_impl.cc b/mysys_ssl/crypt_genhash_impl.cc
@@ -39,8 +39,6 @@
 #include <openssl/evp.h>
 #include <openssl/rand.h>
 #include <openssl/sha.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
-
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/mysys_ssl/my_rnd.cc b/mysys_ssl/my_rnd.cc
@@ -33,8 +33,6 @@
 #include "my_rnd.h"
 #include <openssl/err.h>
 #include <openssl/rand.h>
-#include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
 #if !defined(HAVE_OPENSSL)
 #error not using an SSL library not supported
 #endif

diff --git a/plugin/x/client/mysql41_hash.cc b/plugin/x/client/mysql41_hash.cc
@@ -25,8 +25,6 @@
 #include "plugin/x/client/mysql41_hash.h"
 
 #include <openssl/sha.h>
-#include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
 
 int mysql_mysql41_hash_reset(SHA_CTX *context) { return SHA1_Init(context); }
 

diff --git a/plugin/x/client/password_hasher.cc b/plugin/x/client/password_hasher.cc
@@ -31,8 +31,6 @@
 
 #include <openssl/rand.h>
 #include <openssl/sha.h>
-#include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
 
 #include "my_dbug.h"
 #include "plugin/x/client/mysql41_hash.h"

diff --git a/sql/auth/sha2_password.cc b/sql/auth/sha2_password.cc
@@ -72,8 +72,6 @@ class THD;
 struct SYS_VAR;
 
 #include <openssl/ssl.h>
-#include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
 
 char *caching_sha2_rsa_private_key_path;
 char *caching_sha2_rsa_public_key_path;
@@ -812,7 +810,7 @@ static char perform_full_authentication = '\4';
   Plugin caching_sha2_password works in two phases.
   1. Fast authentication
   2. Complete authentication
-  
+
   If server has cached hash entry for given user in memory, it uses scramble
   sent by client to perform fast authentication. If it is a success,
   authentication is done and connection will move to command phase. If there

diff --git a/sql/auth/sql_authentication.cc b/sql/auth/sql_authentication.cc
@@ -96,13 +96,10 @@
 struct MEM_ROOT;
 
 #if defined(HAVE_OPENSSL)
-#include <wolfssl_fix_namespace_pollution_pre.h>
-
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509v3.h>
-#include <wolfssl_fix_namespace_pollution.h>
 #endif /* HAVE_OPENSSL */
 
 /**

diff --git a/sql/protocol_classic.cc b/sql/protocol_classic.cc
@@ -294,9 +294,8 @@
 #include "sql/protocol_classic.h"
 
 #include <openssl/ssl.h>
+
 #include <string.h>
-#include <wolfssl_fix_namespace_pollution.h>
-#include <wolfssl_fix_namespace_pollution_pre.h>
 #include <algorithm>
 #include <limits>
 

diff --git a/vio/vio_priv.h b/vio/vio_priv.h
@@ -44,7 +44,7 @@ extern PSI_memory_key key_memory_vio_ssl_fd;
 #endif
 
 #ifdef HAVE_WOLFSSL
-#include "wolfssl/openssl/ssl.h"
+
 #ifdef ERROR /* check for conflicting ERROR macro from wingdi.h */
 #undef ERROR
 #endif