Merge commit '99eab5a73a086d01029f8f431f92ca2158ff57d2' into 1.1.9

# Conflicts:
#	CMakeLists.txt

Author: rsomla1

CMakeLists.txt

@@ -94,22 +94,33 @@ ENDIF(CMAKE_ENABLE_C++11)
 # Configure static runtime library on Windows if requested
 #
 
-option(STATIC_MSVCRT "Use static MSVC runtime library" ON)
-
-if(WIN32 AND STATIC_MSVCRT)
-
-message("Using static runtime library")
-
-foreach(LANG C CXX)
-  set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} /MT")
-  foreach(TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
-    set(CMAKE_${LANG}_FLAGS_${TYPE} "${CMAKE_${LANG}_FLAGS_${TYPE}} /MT")
-  endforeach()
-  set(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} /MTd")
-endforeach(LANG)
+option(STATIC_MSVCRT "Use static MSVC runtime library" OFF)
+
+if(WIN32)
+  IF(STATIC_MSVCRT)
+
+    message("Using static runtime library")
+
+    foreach(LANG C CXX)
+      set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} /MT")
+      foreach(TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
+        set(CMAKE_${LANG}_FLAGS_${TYPE} "${CMAKE_${LANG}_FLAGS_${TYPE}} /MT")
+      endforeach()
+      set(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} /MTd")
+    endforeach(LANG)
+ ELSE(STATIC_MSVCRT)
+    foreach(LANG C CXX)
+      set(CMAKE_${LANG}_FLAGS "${CMAKE_${LANG}_FLAGS} /MD")
+      foreach(TYPE RELEASE RELWITHDEBINFO MINSIZEREL)
+        set(CMAKE_${LANG}_FLAGS_${TYPE} "${CMAKE_${LANG}_FLAGS_${TYPE}} /MD")
+      endforeach()
+      set(CMAKE_${LANG}_FLAGS_DEBUG "${CMAKE_${LANG}_FLAGS_DEBUG} /MDd")
+    endforeach(LANG)
+ ENDIF(STATIC_MSVCRT)
 
 endif()
 
+
 #-----------------
 # ICU
 

driver/mysql_art_resultset.h

@@ -46,7 +46,7 @@ namespace mysql
 
 class MySQL_DebugLogger;
 
-class MyVal
+class CPPCONN_PUBLIC_FUNC MyVal
 {
 	union {
 		sql::SQLString * str;

driver/nativeapi/mysql_private_iface.h

@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2008, 2017, Oracle and/or its affiliates. All rights reserved.
 
 The MySQL Connector/C++ is licensed under the terms of the GPLv2
 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most
@@ -48,6 +48,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define snprintf _snprintf
 #endif
 
+#if ( defined(_WIN32) || defined(_WIN64) ) && (_MSC_VER >= 1900)
+#define HAVE_STRUCT_TIMESPEC
+#endif
 
 #if !defined(_WIN32) && !defined(_WIN64)
 extern "C"

test/unit/classes/CMakeLists.txt

@@ -198,16 +198,8 @@ SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
           OUTPUT_NAME "art_resultset"
           LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
           COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
+TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
 
-IF(WIN32)
-  TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES_STATIC_CPPLIB} ${MY_GCOV_LINK_LIBRARIES})
-#  SET_TARGET_PROPERTIES(test_art_resultset PROPERTIES
-#    LINK_FLAGS_DEBUG "/NODEFAULTLIB:LIBCMTD /NODEFAULTLIB:LIBCMT"
-#    LINK_FLAGS_RELWITHDEBINFO "/NODEFAULTLIB:LIBCMT"
-#    LINK_FLAGS_RELEASE "/NODEFAULTLIB:LIBCMT")
-ELSE(WIN32)
-  TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
-ENDIF(WIN32)
 
 MESSAGE(STATUS "Configuring unit tests - art_resultset")