Merge branch 'refs/heads/master' into wl13563-vs2019

Author: rsomla1

cdk/cmake/compiler/CLANG.cmake

@@ -29,8 +29,10 @@
 
 function(enable_cxx11)
 
+  add_flags(CXX -std=c++11)
+
   #
-  # If Clang is used and deployment target is not specified
+  # If Clang is used on macOS and deployment target is not specified
   # with MACOSX_DEPLOYMENT_TARGET environment variable, make
   # sure that clang's native implementation of C++ std
   # libarary (libc++) is used. Otherwise clang defaults to
@@ -41,7 +43,9 @@ function(enable_cxx11)
   # so.
   #
 
-  add_flags(CXX -std=c++11 -stdlib=libc++)
+  if (MACOS)
+    add_flags(CXX -stdlib=libc++)
+  endif()
 
 endfunction()
 

cdk/include/mysql/cdk/mysqlx/session.h

@@ -440,8 +440,6 @@ class Session
 
 private:
 
-  friend Stmt_op;
-
   // Send Connection Attributes
   void send_connection_attr(const Options &options);
   // Authentication (cdk::protocol::mysqlx::Auth_processor)

cdk/parser/tokenizer.cc

@@ -421,15 +421,6 @@ bool Tokenizer::iterator::parse_quotted_string(char qchar)
 */
 
 
-namespace {
-
-  // Note: be independent from the system locale settings.
-
-  std::locale c_loc("C");
-  const std::ctype<char> &ctf = std::use_facet<std::ctype<char>>(c_loc);
-
-}
-
 std::locale char_iterator::m_cloc("C");
 
 

common/result.h

@@ -1023,7 +1023,26 @@ class Result_impl
     if(!m_result_mdata.empty())
       m_result_mdata.pop();
     if (!m_result_cache.empty())
+    {
+      /*
+        At this point m_cache_it can point inside the last entry of
+        m_result_cache that is just to be removed. Such dangling iterator
+        can cause issues when later it is assigned to a new value (as
+        compiler thinks it is still pointing inside old container and might
+        want to do some cleanups). To avoid dangling iterator, we reset it
+        to something neutral here.
+
+        Note: This "fix" works under assumption that "one past the end"
+        iterator is compatible between different containers, which seems to
+        be the case for all compilers we use.
+
+        TODO: A better solution would be to use std::option<> type for
+        m_cache_it.
+      */
+
+      m_cache_it = m_result_cache.back().end();
       m_result_cache.pop();
+    }
     if (!m_result_cache_size.empty())
       m_result_cache_size.pop();
   }

jdbc

@@ -40,17 +40,14 @@ PROJECT(MySQL_CONCPP_TEST)
 # BUILD_STATIC            whether to link with connector statically
 #                         or dynamically (the default)
 #
-# WITH_SSL                tells if connector uses built-in SSL implementation
-#                         or relies on external OpenSSL libraries (*)
+# WITH_SSL                if we use static linking with connector, we may have
+#                         to pass path to openssl package
 #
 # WITH_JDBC               also build JDBC API test application
 #
 # WITH_BOOST              where to look for Boost (required only when building
 #                         JDBC API application)
 #
-# *) If WITH_SSL is set to "builtin" or if it points at WoflSSL sources then
-#    it is assumed that connector has SSL support built-in. In all other cases
-#    it is assumed that connector uses OpenSSL libraries.
 #
 # Note: Either WITH_CONCPP or CONCPP_INCLUDE_DIR and CONCPP_LIB_DIR must be
 # set.
@@ -125,13 +122,21 @@ set(WITH_SSL $ENV{WITH_SSL} CACHE STRING
   "Set to 'builtin' if connector was built with built-in SSL support"
 )
 
-if(NOT WITH_SSL)
-  # Set to the default if WITH_SSL is not defined
-  set(WITH_SSL "system")
-elseif(EXISTS "${WITH_SSL}/wolfssl/openssl/ssl.h")
-  set(WITH_SSL "builtin")
+if(NOT WITH_SSL MATCHES "^(system|yes)$")
+
+  if(EXISTS ${WITH_SSL}/include/openssl/ssl.h)
+    set(OPENSSL_ROOT_DIR  "${WITH_SSL}")
+  endif()
+
 endif()
 
+find_package(OpenSSL)
+
+if(OPENSSL_FOUND)
+  MESSAGE(STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
+  MESSAGE(STATUS "OPENSSL_SSL_LIBRARY = ${OPENSSL_SSL_LIBRARY}")
+  MESSAGE(STATUS "OPENSSL_CRYPTO_LIBRARY = ${OPENSSL_CRYPTO_LIBRARY}")
+endif()
 
 option(WITH_JDBC "Also build the JDBC API test application" OFF)
 
@@ -288,10 +293,11 @@ if(NOT WIN32)
     # link to them too.
     #
 
-    if(NOT WITH_SSL STREQUAL "builtin")
+    if(OPENSSL_FOUND)
       set_property(TARGET MySQL::conncpp
-        APPEND PROPERTY INTERFACE_LINK_LIBRARIES  ssl crypto
-      )
+        APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+        ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY}
+        )
     endif()
 
 endif()
@@ -398,9 +404,12 @@ endif()
 add_executable(devapi_test devapi_test.cc)
 target_link_libraries(devapi_test MySQL::conncpp)
 
+
+
 add_executable(xapi_test xapi_test.c)
 target_link_libraries(xapi_test MySQL::conncpp)
 
+
 #
 # Note: Connector/C++ library depends on C++ runtime library.
 # For that reason, even code that is otherwise plain C, should