Merge branch 'refs/heads/master' into wl12755-tls-ciphers

rsomla1 · rsomla1 · commit e006ad4f83c4 · 2019-11-13T09:23:19.000+01:00
diff --git a/cdk/cmake/DepFindProtobuf.cmake b/cdk/cmake/DepFindProtobuf.cmake
@@ -226,9 +226,27 @@ if(SUNPRO)
   )
 endif()
 
+#
+# Try using parallel builds for protobuf.
+#
+
+include(ProcessorCount)
+ProcessorCount(N)
+
+MESSAGE("Processor Count: ${N}")
+
+set(opt_build)
+set(opt_tool)
+if(NOT N EQUAL 0)
+  if(NOT CMAKE_VERSION VERSION_LESS 3.12)
+    set(opt_build --parallel ${N})
+  elseif(CMAKE_MAKE_PROGRAM MATCHES "make")
+    set(opt_tool -j${N})
+  endif()
+endif()
 
 add_custom_command(OUTPUT "${build_stamp}"
-  COMMAND ${CMAKE_COMMAND} --build . --config ${CONFIG_EXPR}
+  COMMAND ${CMAKE_COMMAND} --build . ${opt_build} --config ${CONFIG_EXPR} -- ${opt_tool}
   COMMAND ${CMAKE_COMMAND} -E touch "${build_stamp}"
   WORKING_DIRECTORY "${PB_BINARY_DIR}"
   COMMENT "Building protobuf"
@@ -308,4 +326,3 @@ function(mysqlx_protobuf_generate_cpp SRCS HDRS)
   SET(${HDRS} ${hdrs} PARENT_SCOPE)
 
 endfunction(mysqlx_protobuf_generate_cpp)
-
diff --git a/cdk/cmake/compiler/CLANG.cmake b/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()
 
diff --git a/cdk/cmake/gtest.cmake b/cdk/cmake/gtest.cmake
@@ -39,84 +39,87 @@ ENDMACRO(SETUP_GTEST)
 
 SET(WITH_GTEST $ENV{WITH_GTEST} CACHE PATH "Location of gtest")
 
-#
-# TODO: Try to find gtest in system-wide locations if WITH_GTEST is
-# not set
-#
 
-if(DEFINED WITH_GTEST)
-  set(GTEST_ROOT ${WITH_GTEST})
-endif()
+if(NOT WITH_GTEST)
 
-find_package(GTest)
+  #
+  # Try to find gtest in system-wide locations
+  #
 
-if(NOT GTEST_FOUND)
+  find_package(GTest)
 
-IF(NOT DEFINED WITH_GTEST)
-  MESSAGE(FATAL_ERROR "This project requires gtest libraries"
-          " but WITH_GTEST option was not specified."
-          " Please set it to the location where gtest"
-          " was built from sources using cmake.")
-ENDIF()
+  if(NOT GTEST_FOUND)
+    message(FATAL_ERROR "This project requires gtest libraries"
+            " but WITH_GTEST option was not specified."
+            " Please set it to the location where gtest"
+            " was built from sources using cmake.")
+  endif()
 
-message("Looking for gtest build in: ${WITH_GTEST}")
+  list(GET GTEST_LIBRARIES 0 gtest_location)
+  list(GET GTEST_MAIN_LIBRARIES 0  gtest_main_location)
 
-#
-# TODO: Configure gtest build if sources location is given
-#
+else(NOT WITH_GTEST)
 
-IF(NOT EXISTS "${WITH_GTEST}/CMakeCache.txt")
-MESSAGE(FATAL_ERROR
-  "Could not find gtest build in this location: ${WITH_GTEST}"
-)
-ENDIF()
+  message("Looking for gtest build in: ${WITH_GTEST}")
 
-#
-# Read source location from build configuration cache and set
-# GTEST_INCLUDE_DIR.
-#
+  #
+  # TODO: Configure gtest build if source location is given
+  #
 
-LOAD_CACHE(${WITH_GTEST} READ_WITH_PREFIX GTEST_
-    CMAKE_PROJECT_NAME)
-#MESSAGE(STATUS "Gtest project name: ${GTEST_CMAKE_PROJECT_NAME}")
+  if(NOT EXISTS "${WITH_GTEST}/CMakeCache.txt")
+    message(FATAL_ERROR
+      "Could not find gtest build in this location: ${WITH_GTEST}"
+    )
+  endif()
 
-LOAD_CACHE(${WITH_GTEST} READ_WITH_PREFIX GTEST_
-    ${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR)
+  #
+  # Read source location from build configuration cache and set
+  # GTEST_INCLUDE_DIR.
+  #
 
-FIND_PATH(GTEST_INCLUDE_DIRS
-        NAMES gtest/gtest.h
-        PATHS ${GTEST_${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR}/include ${GTEST_${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR}/gtest/include
-        NO_DEFAULT_PATH
-          )
+  load_cache(${WITH_GTEST} READ_WITH_PREFIX GTEST_
+    CMAKE_PROJECT_NAME
+  )
+  #MESSAGE(STATUS "Gtest project name: ${GTEST_CMAKE_PROJECT_NAME}")
 
-IF(NOT EXISTS "${GTEST_INCLUDE_DIRS}/gtest/gtest.h")
-  MESSAGE(FATAL_ERROR "Could not find gtest headers at: ${GTEST_INCLUDE_DIRS}")
-ENDIF()
+  load_cache(${WITH_GTEST} READ_WITH_PREFIX GTEST_
+    ${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR
+  )
 
-#
-# TODO: Run build if libraries can not be found in expected locations
-#
+  message("Gtest sources at: ${GTEST_${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR}")
 
-FIND_LIBRARY(gtest_location
-  NAMES libgtest gtest
-  PATHS ${WITH_GTEST} ${WITH_GTEST}/gtest
-  PATH_SUFFIXES . Release RelWithDebInfo Debug
-  NO_DEFAULT_PATH
-)
+  find_path(GTEST_INCLUDE_DIRS
+    NAMES gtest/gtest.h
+    PATHS
+      ${GTEST_${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR}/include
+      ${GTEST_${GTEST_CMAKE_PROJECT_NAME}_SOURCE_DIR}/gtest/include
+    NO_DEFAULT_PATH
+  )
 
-FIND_LIBRARY(gtest_main_location
-  NAMES libgtest_main gtest_main
-  PATHS ${WITH_GTEST} ${WITH_GTEST}/gtest
-  PATH_SUFFIXES . Release RelWithDebInfo Debug
-  NO_DEFAULT_PATH
-)
+  if(NOT EXISTS "${GTEST_INCLUDE_DIRS}/gtest/gtest.h")
+    message(FATAL_ERROR "Could not find gtest headers at: ${GTEST_INCLUDE_DIRS}")
+  endif()
+
+  #
+  # TODO: Run build if libraries can not be found in expected locations
+  #
+
+  find_library(gtest_location
+    NAMES libgtest gtest
+    PATHS ${WITH_GTEST} ${WITH_GTEST}/gtest
+    PATH_SUFFIXES . Release RelWithDebInfo Debug
+    NO_DEFAULT_PATH
+  )
 
-else()
+  find_library(gtest_main_location
+    NAMES libgtest_main gtest_main
+    PATHS ${WITH_GTEST} ${WITH_GTEST}/gtest
+    PATH_SUFFIXES . Release RelWithDebInfo Debug
+    NO_DEFAULT_PATH
+  )
 
-list(GET GTEST_LIBRARIES 0 gtest_location)
-list(GET GTEST_MAIN_LIBRARIES 0  gtest_main_location)
+endif(NOT WITH_GTEST)
 
-endif(NOT GTEST_FOUND)
 
 MESSAGE(STATUS "GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}")
 
diff --git a/cdk/include/mysql/cdk/foundation/std_error_conditions.h b/cdk/include/mysql/cdk/foundation/std_error_conditions.h
@@ -98,15 +98,15 @@
   X (operation_not_permitted,       EPERM)            \
   X (operation_not_supported,       EOPNOTSUPP)       \
   X (operation_would_block,         EWOULDBLOCK)      \
-  X (owner_dead,                    EOWNERDEAD)       \
+/*  X (owner_dead,                    EOWNERDEAD)     */\
   X (permission_denied,             EACCES)           \
   X (protocol_error,                EPROTO)           \
   X (protocol_not_supported,        EPROTONOSUPPORT)  \
   X (read_only_file_system,         EROFS)            \
   X (resource_deadlock_would_occur, EDEADLK)          \
   X (resource_unavailable_try_again, EAGAIN)          \
   X (result_out_of_range,           ERANGE)           \
-  X (state_not_recoverable,         ENOTRECOVERABLE)  \
+/*  X (state_not_recoverable,         ENOTRECOVERABLE)*/\
 /*  X (stream_timeout,                ETIME)          */\
   X (text_file_busy,                ETXTBSY)          \
   X (timed_out,                     ETIMEDOUT)        \
diff --git a/cdk/include/mysql/cdk/mysqlx/session.h b/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)
diff --git a/cdk/parser/tokenizer.cc b/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");
 
 
diff --git a/common/result.h b/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();
   }
diff --git a/devapi/tests/crud-t.cc b/devapi/tests/crud-t.cc
@@ -159,7 +159,9 @@ TEST_F(Crud, basic)
     cout << "Query sent, reading rows..." << endl;
     cout << "There are " << res.getColumnCount() << " columns in the result" << endl;
 
-    EXPECT_EQ(3, res.getColumnCount());
+    //From server 8.0.19, 3 columns are expected
+    //have 2 columns
+    EXPECT_GE(res.getColumnCount(), 2);
 
     Row row;
     unsigned row_count = 0;
diff --git a/devapi/tests/session-t.cc b/devapi/tests/session-t.cc
@@ -2225,24 +2225,25 @@ TEST_F(Sess, pool_ttl)
 
 #endif
 
-  {
+  // Temporary disabled, bug#30532629
 
+#if 0
+  {
     std::cout << "Not threaded" << std::endl;
 
     settings.set(ClientOption::POOL_QUEUE_TIMEOUT, std::chrono::seconds(100),
-    ClientOption::POOL_MAX_IDLE_TIME, std::chrono::seconds(10));
+      ClientOption::POOL_MAX_IDLE_TIME, std::chrono::seconds(10));
 
     mysqlx::Client client(settings);
 
 
-    auto get_sessions = [&client, &max_connections] ()
+    auto get_sessions = [&client, &max_connections]()
     {
       std::list<mysqlx::Session> sessions;
-      for(int i = 0; i < max_connections; ++i)
+      for (int i = 0; i < max_connections; ++i)
       {
         sessions.emplace_back(client);
         EXPECT_EQ(1, sessions.back().sql("select 1").execute()
-                     .fetchOne()[0].get<int>());
       }
     };
 
@@ -2254,15 +2255,13 @@ TEST_F(Sess, pool_ttl)
 
     int this_thread_id = sql("SELECT CONNECTION_ID()").fetchOne()[0].get<int>();
 
-    std::list<Row> rows =sql("show processlist").fetchAll();
+    std::list<Row> rows = sql("show processlist").fetchAll();
 
     for (auto row : rows)
     {
       auto val = row.get(7);
       int thread_id = row.get(0).get<int>();
       if (val.isNull() ||
-          val.get<string>() != string("PLUGIN") ||
-          thread_id == this_thread_id)
         continue;
 
       proccess_ids.push_back(thread_id);
@@ -2291,6 +2290,9 @@ TEST_F(Sess, pool_ttl)
     client.getSession().sql("set global mysqlx_wait_timeout=28800").execute();
   }
 
+#endif // 0
+
+
   {
     settings.set(ClientOption::POOL_MAX_SIZE, 1);
 
diff --git a/testapp/CMakeLists.txt b/testapp/CMakeLists.txt
