Merge remote-tracking branch 'origin/wl13162'

# Conflicts:
#	cdk/foundation/connection_openssl.cc
#	cdk/include/mysql/cdk.h
#	jdbc

Author: rsomla1

cdk/cmake/DepFindSSL.cmake

@@ -219,13 +219,13 @@ function(find_openssl)
 
 
   find_library(OPENSSL_LIBRARY
-    NAMES ssl ssleay32 ssleay32MD
+    NAMES ssl ssleay32 ssleay32MD libssl
     PATH_SUFFIXES lib
     ${hints}
   )
 
   find_library(CRYPTO_LIBRARY
-    NAMES crypto libeay32 libeay32MD
+    NAMES crypto libeay32 libeay32MD libcrypto
     PATH_SUFFIXES lib
     ${hints}
   )

cdk/foundation/connection_openssl.cc

@@ -44,6 +44,24 @@ POP_SYS_WARNINGS_CDK
 #include "connection_tcpip_base.h"
 
 
+/*
+  On Windows, external dependencies can be declared using
+  #pragma comment directive.
+*/
+
+#ifdef _WIN32
+  #pragma comment(lib,"ws2_32")
+  #if defined(WITH_SSL)
+    #if OPENSSL_VERSION_NUMBER < 0x10100000L
+      #pragma comment(lib,"ssleay32")
+      #pragma comment(lib,"libeay32")
+    #else
+      #pragma comment(lib,"libssl")
+      #pragma comment(lib,"libcrypto")
+    #endif
+  #endif
+#endif
+
 static const char tls_ciphers_list[]="ECDHE-ECDSA-AES128-GCM-SHA256:"
                                      "ECDHE-ECDSA-AES256-GCM-SHA384:"
                                      "ECDHE-RSA-AES128-GCM-SHA256:"

cdk/include/mysql/cdk.h

@@ -38,20 +38,6 @@
 #include "cdk/cursor.h"
 #include "cdk/codec.h"
 
-/*
-  On Windows, external dependencies can be declared using
-  #pragma comment directive.
-*/
-
-#ifdef _WIN32
-#pragma comment(lib,"ws2_32")
-#if defined(WITH_SSL)
-  #pragma comment(lib,"ssleay32")
-  #pragma comment(lib,"libeay32")
-#endif
-#endif
-
-
 namespace cdk {
 
 typedef Cursor::Row_processor Row_processor;