Merge remote-tracking branch 'origin/release/8.0.16'

Author: rsomla1

LICENSE.txt

@@ -10,7 +10,7 @@ Introduction
    third-party software which may be included in this distribution of
    MySQL Connector/C++ 8.0.
 
-   Last updated: January 2019.
+   Last updated: March 2019
 
 Licensing Information
 
@@ -2059,4 +2059,4 @@ Written Offer for Source Code
     a. within three (3) years of the date you received the Oracle product
        that included the binary that is the subject of your request, or
     b. in the case of code licensed under the GPL v3 for as long as Oracle
-       offers spare parts or customer support for that product model.
+       offers spare parts or customer support for that product model.

PackageSpecs.cmake

@@ -110,6 +110,7 @@ ELSE(EXTRA_NAME_SUFFIX)
 ENDIF(EXTRA_NAME_SUFFIX)
 
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
+set(CPACK_TOPLEVEL_TAG              "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 set(CPACK_PACKAGE_FILE_NAME         "${CPACK_PACKAGE_INSTALL_DIRECTORY}")
 if(CMAKE_BUILD_TYPE STREQUAL Debug)
   set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}-debug")

cdk/cmake/compiler/GCC.cmake

@@ -28,6 +28,27 @@
 
 ##########################################################################
 
+#
+# Ensure relative source locations in debug entries
+#
+
+option(DEBUG_PREFIX_MAP
+  "Set -fdebug-prefix-map option to ensure relative source locations in debug entries."
+  ON
+)
+
+if(DEBUG_PREFIX_MAP)
+
+  foreach(LANG C CXX)
+  foreach(TYPE DEBUG RELWITHDEBINFO)
+    set(CMAKE_${LANG}_FLAGS_${TYPE}
+      "-fdebug-prefix-map=${CMAKE_SOURCE_DIR}=. ${CMAKE_${LANG}_FLAGS_${TYPE}}"
+    )
+  endforeach(TYPE)
+  endforeach(LANG)
+
+endif(DEBUG_PREFIX_MAP)
+
 #
 # Deal with broken optimization in gcc 4.8.
 #

cdk/foundation/socket_detail.cc

@@ -44,6 +44,7 @@ PUSH_SYS_WARNINGS_CDK
 #include <limits>
 #include <chrono>
 #include <sstream>
+
 #ifndef _WIN32
 #include <arpa/inet.h>
 #include <signal.h>
@@ -607,9 +608,14 @@ Socket connect(const char *host_name, unsigned short port,
         if (connect_result == SOCKET_ERROR && errno == EINPROGRESS)
       #endif
         {
-          int select_result = poll_one(socket, POLL_MODE_CONNECT,true,
-                                         (uint64_t)duration_cast<microseconds>(
-                                           deadline - system_clock::now()).count());
+          auto timeout = duration_cast<microseconds>(
+            deadline - system_clock::now()
+          ).count();
+
+          int select_result = poll_one(
+            socket, POLL_MODE_CONNECT, true,
+            0 == timeout_usec ? 0 : timeout > 0 ? timeout : 1
+          );
 
           if (select_result == 0 && (timeout_usec > 0) &&
                (std::chrono::system_clock::now() >= deadline))
@@ -759,6 +765,7 @@ Socket listen_and_accept(unsigned short port)
   return client;
 }
 
+
 int poll_one(Socket socket, Poll_mode mode, bool wait,
                uint64_t timeout_usec)
 {
@@ -790,13 +797,9 @@ DIAGNOSTIC_PUSH_CDK
 DIAGNOSTIC_POP_CDK
 
   //milliseconds
-  int timeout = -1;
-
-  if (wait && timeout_usec > 0)
-  {
-    // If timeout is specified we will use it
-    timeout = static_cast<int>(timeout_usec / 1000);
-  }
+  int timeout =
+    !wait ? 0
+    : timeout_usec > 0 ? static_cast<int>((1000+timeout_usec) / 1000) : -1;
 
 #ifdef _WIN32
   int result = ::WSAPoll(&fds, 1, timeout);

jdbc

@@ -130,7 +130,7 @@ test suite for MySQL Connector/C++
 %endif
 
 %global __cmake_explicit_opts -DCMAKE_INSTALL_PREFIX="%_prefix" -DCMAKE_C_FLAGS:STRING="%optflags" -DCMAKE_CXX_FLAGS:STRING="%optflags"
-%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt}
+%global __cmake_common_opts -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/mysql-cppconn-8 -DWITH_JDBC=ON -DWITH_SSL=system %{__cmake_test_opts} %{?mysql_opt} -DDEBUG_PREFIX_MAP=OFF
 
 %if 0%{?rhel}
 %global __cmake_cmd cmake3 %{__cmake_common_opts} %{__cmake_explicit_opts} ..