Merge tag 'clone-5.7.22-build' into mysql-5.7-cluster-7.5

Change-Id: Ib863957070763c17ccffd9a926bf5ce99e7221da

Author: arnabray21

CMakeLists.txt

@@ -15,7 +15,8 @@
 
 IF(WIN32)
   # CMake 2.8.12 is needed for Visual Studio 2013
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
+  # CMake 3.1.0 is needed for $<TARGET_PDB_FILE:${target}>
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
 ELSE()
   # There's a bug in unzipping prior to 2.8.2
   # Debian 7 has the oldest cmake we need to support
@@ -33,12 +34,10 @@ IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
  CMAKE_POLICY(SET CMP0022 OLD)
 ENDIF()
 
-# We use the LOCATION target property (CMP0026)
-# and get_target_property() for non-existent targets (CMP0045)
+# We use get_target_property() for non-existent targets (CMP0045)
 # and INSTALL_NAME_DIR (CMP0042)
 IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
    CMAKE_VERSION VERSION_GREATER "3.0.0")
- CMAKE_POLICY(SET CMP0026 OLD)
  CMAKE_POLICY(SET CMP0045 OLD)
  CMAKE_POLICY(SET CMP0042 OLD)
 ENDIF()

Docs/ChangeLog

@@ -0,0 +1,2 @@
+You can find a detailed list of changes at
+  to https://github.com/mysql/mysql-server/commits/5.7

VERSION

@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=7
-MYSQL_VERSION_PATCH=21
+MYSQL_VERSION_PATCH=22
 MYSQL_VERSION_EXTRA=-ndb-7.5.10

client/mysqladmin.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1092,12 +1092,14 @@ static int execute_commands(MYSQL *mysql,int argc, char **argv)
 
       /* Warn about password being set in non ssl connection */
 #if defined(HAVE_OPENSSL) && !defined(EMBEDDED_LIBRARY)
-      uint ssl_mode;
-      if (!mysql_get_option(mysql, MYSQL_OPT_SSL_MODE, &ssl_mode) &&
-          ssl_mode <= SSL_MODE_PREFERRED)
       {
-        fprintf(stderr, "Warning: Since password will be sent to server in "
-                "plain text, use ssl connection to ensure password safety.\n");
+        uint ssl_mode= 0;
+        if (!mysql_get_option(mysql, MYSQL_OPT_SSL_MODE, &ssl_mode) &&
+            ssl_mode <= SSL_MODE_PREFERRED)
+        {
+          fprintf(stderr, "Warning: Since password will be sent to server in "
+                  "plain text, use ssl connection to ensure password safety.\n");
+        }
       }
 #endif
       memset(buff, 0, sizeof(buff));

client/mysqlbinlog.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1167,11 +1167,14 @@ void end_binlog(PRINT_EVENT_INFO *print_event_info)
   Print the given event, and either delete it or delegate the deletion
   to someone else.
 
-  The deletion may be delegated in two cases: (1) the event is a
-  Format_description_log_event, and is saved in
-  glob_description_event; (2) the event is a Create_file_log_event,
-  and is saved in load_processor.
-
+  The deletion may be delegated in these cases:
+  (1) the event is a Format_description_log_event, and is saved in
+      glob_description_event.
+  (2) the event is a Create_file_log_event, and is saved in load_processor.
+  (3) the event is an Intvar, Rand or User_var event, it will be kept until
+      the subsequent Query_log_event.
+  (4) the event is a Table_map_log_event, it will be kept until the subsequent
+      Rows_log_event.
   @param[in,out] print_event_info Parameters and context state
   determining how to print.
   @param[in] ev Log_event to process.

client/mysqltest.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,6 +50,7 @@
 
 #include <welcome_copyright_notice.h> // ORACLE_WELCOME_COPYRIGHT_NOTICE
 
+#include <sstream>
 #include <string>
 #include <algorithm>
 #include <functional>
@@ -8224,8 +8225,8 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
   /* Init dynamic strings for warnings */
   if (!disable_warnings)
   {
-    init_dynamic_string(&ds_prepare_warnings, NULL, 0, 256);
-    init_dynamic_string(&ds_execute_warnings, NULL, 0, 256);
+    init_dynamic_string(&ds_prepare_warnings, "", 0, 256);
+    init_dynamic_string(&ds_execute_warnings, "", 0, 256);
   }
 
   /*
@@ -8327,13 +8328,6 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
       append_stmt_result(ds, stmt, fields, num_fields);
 
       mysql_free_result(res);     /* Free normal result set with meta data */
-
-      /*
-        Clear prepare warnings if there are execute warnings,
-        since they are probably duplicated.
-      */
-      if (ds_execute_warnings.length || mysql->warning_count)
-        dynstr_set(&ds_prepare_warnings, NULL);
     }
     else
     {
@@ -8368,8 +8362,26 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
           dynstr_append_mem(ds, ds_warnings->str,
                             ds_warnings->length);
         if (ds_prepare_warnings.length)
-          dynstr_append_mem(ds, ds_prepare_warnings.str,
-                            ds_prepare_warnings.length);
+        {
+          /* Split the string to get each warning */
+          std::stringstream prepare_warnings(ds_prepare_warnings.str);
+          std::string prepare_warning;
+          /*
+            If the warning is already present in the execute phase,
+            do not append it
+          */
+          while (std::getline(prepare_warnings, prepare_warning))
+          {
+            std::string execute_warnings(ds_execute_warnings.str);
+            if ((execute_warnings + "\n").find(prepare_warning + "\n") ==
+                std::string::npos)
+            {
+              dynstr_append_mem(ds, prepare_warning.c_str(),
+                                prepare_warning.length());
+              dynstr_append_mem(ds, "\n", 1);
+            }
+          }
+        }
         if (ds_execute_warnings.length)
           dynstr_append_mem(ds, ds_execute_warnings.str,
                             ds_execute_warnings.length);

cmake/install_macros.cmake

@@ -16,10 +16,10 @@
 GET_FILENAME_COMPONENT(MYSQL_CMAKE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
 INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake)
 
+# For windows: install .pdf file for each target.
 MACRO (INSTALL_DEBUG_SYMBOLS targets)
   IF(MSVC)
   FOREACH(target ${targets})
-    GET_TARGET_PROPERTY(location ${target} LOCATION)
     GET_TARGET_PROPERTY(type ${target} TYPE)
     IF(NOT INSTALL_LOCATION)
       IF(type MATCHES "STATIC_LIBRARY"
@@ -33,22 +33,16 @@ MACRO (INSTALL_DEBUG_SYMBOLS targets)
           "cannot determine type of ${target}. Don't now where to install")
      ENDIF()
     ENDIF()
-    STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
-    STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
-    STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
-    IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      STRING(REPLACE
-        "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
-        pdb_location ${pdb_location})
-    ENDIF()
+
     IF(target STREQUAL "mysqld")
-	  SET(comp Server)
+      SET(comp Server)
     ELSE()
       SET(comp Debuginfo)
-    ENDIF()	  
+    ENDIF()
+
     # No .pdb file for static libraries.
     IF(NOT type MATCHES "STATIC_LIBRARY")
-      INSTALL(FILES ${pdb_location}
+      INSTALL(FILES $<TARGET_PDB_FILE:${target}>
         DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
     ENDIF()
   ENDFOREACH()
@@ -110,41 +104,112 @@ FUNCTION(MYSQL_INSTALL_TARGETS)
   SET(INSTALL_LOCATION)
 ENDFUNCTION()
 
-# Optionally install mysqld/client/embedded from debug build run. outside of the current build dir 
+# Optionally install mysqld/client/embedded from debug build run.
+# outside of the current build dir
 # (unless multi-config generator is used like Visual Studio or Xcode). 
 # For single-config generators like Makefile generators we default Debug
 # build directory to ${buildroot}/../debug.
 GET_FILENAME_COMPONENT(BINARY_PARENTDIR ${CMAKE_BINARY_DIR} PATH)
-SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL "Directory of debug build")
+SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/debug" CACHE INTERNAL
+  "Directory of debug build")
 
 
 FUNCTION(INSTALL_DEBUG_TARGET target)
- MYSQL_PARSE_ARGUMENTS(ARG
-  "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT;SUFFIX"
-  ""
-  ${ARGN}
-  )
+  MYSQL_PARSE_ARGUMENTS(ARG
+    "DESTINATION;RENAME;COMPONENT"
+    ""
+    ${ARGN}
+    )
+
+  # Relevant only for RelWithDebInfo builds
+  IF(BUILD_IS_SINGLE_CONFIG AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+    RETURN()
+  ENDIF()
+
   GET_TARGET_PROPERTY(target_type ${target} TYPE)
+  GET_TARGET_PROPERTY(target_name ${target} DEBUG_OUTPUT_NAME)
+  IF(NOT target_name)
+    GET_TARGET_PROPERTY(target_name ${target} OUTPUT_NAME)
+    IF(NOT target_name)
+      SET(target_name "${target}")
+    ENDIF()
+  ENDIF()
+
+  # On windows we install client libraries
+  IF(target_type STREQUAL "STATIC_LIBRARY")
+    SET(debug_target_location
+      "${CMAKE_BINARY_DIR}/archive_output_directory/Debug/${target_name}.lib")
+    # On UNIX we install mysqlserver which has name libmysqld.a
+    IF(UNIX)
+      IF(BUILD_IS_SINGLE_CONFIG)
+        SET(debug_target_location
+          "${DEBUGBUILDDIR}/archive_output_directory/lib${target_name}.a")
+      ELSE()
+        SET(debug_target_location
+          "${CMAKE_BINARY_DIR}/archive_output_directory/Debug/lib${target_name}.a")
+      ENDIF()
+      MESSAGE(STATUS
+        "library target ${target} debug_target ${debug_target_location}")
+    ENDIF()
+  # mysqld or mysqld-debug
+  ELSEIF(target_type STREQUAL "EXECUTABLE")
+    GET_TARGET_PROPERTY(runtime_output_directory ${target}
+      RUNTIME_OUTPUT_DIRECTORY)
+    IF(NOT runtime_output_directory)
+      MESSAGE(FATAL_ERROR "unknown executable!!")
+    ENDIF()
+
+    STRING(REPLACE
+      "${CMAKE_BINARY_DIR}/" "" RELATIVE_DIR ${runtime_output_directory})
+
+    SET(EXE_SUFFIX "${CMAKE_EXECUTABLE_SUFFIX}")
+    IF(BUILD_IS_SINGLE_CONFIG)
+      SET(debug_target_location
+        "${DEBUGBUILDDIR}/${RELATIVE_DIR}/${target_name}${EXE_SUFFIX}")
+    ELSE()
+      SET(debug_target_location
+        "${CMAKE_BINARY_DIR}/${RELATIVE_DIR}/Debug/${target_name}${EXE_SUFFIX}")
+    ENDIF()
+    MESSAGE(STATUS
+      "executable target ${target} debug_target ${debug_target_location}")
+
+  # Plugins and components
+  ELSEIF(target_type STREQUAL "MODULE_LIBRARY")
+    SET(DLL_SUFFIX "${CMAKE_SHARED_LIBRARY_SUFFIX}")
+    IF(APPLE)
+      SET(DLL_SUFFIX ".so") # we do not use .dylib
+    ENDIF()
+    GET_TARGET_PROPERTY(
+      target_output_directory ${target}  LIBRARY_OUTPUT_DIRECTORY)
+    IF(NOT target_output_directory)
+      MESSAGE(FATAL_ERROR "unknown module!!")
+    ENDIF()
+
+    STRING(REPLACE
+      "${CMAKE_BINARY_DIR}/" "" RELATIVE_DIR ${target_output_directory})
+
+    IF(BUILD_IS_SINGLE_CONFIG)
+      SET(debug_target_location
+        "${DEBUGBUILDDIR}/${RELATIVE_DIR}/${target_name}${DLL_SUFFIX}")
+    ELSE()
+      SET(debug_target_location
+        "${CMAKE_BINARY_DIR}/${RELATIVE_DIR}/Debug/${target_name}${DLL_SUFFIX}")
+    ENDIF()
+    # MESSAGE(STATUS
+    # "module target ${target} debug_target ${debug_target_location}")
+  ENDIF()
+
+  # This is only used for mysqld / mysqld-debug / libmysqlserver.a
   IF(ARG_RENAME)
-    SET(RENAME_PARAM RENAME ${ARG_RENAME}${CMAKE_${target_type}_SUFFIX})
+    SET(RENAME_PARAM RENAME ${ARG_RENAME})
   ELSE()
     SET(RENAME_PARAM)
   ENDIF()
+
   IF(NOT ARG_DESTINATION)
     MESSAGE(FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET")
   ENDIF()
-  GET_TARGET_PROPERTY(target_location ${target} LOCATION)
-  IF(BUILD_IS_SINGLE_CONFIG)
-   STRING(REPLACE "${CMAKE_BINARY_DIR}" "${DEBUGBUILDDIR}"  debug_target_location "${target_location}")
-  ELSE()
-   STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug"  debug_target_location "${target_location}" )
-  ENDIF()
-  IF(ARG_SUFFIX) 
-    GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
-    GET_FILENAME_COMPONENT(fn  ${debug_target_location} NAME_WE)
-    STRING(REPLACE "${fn}${ext}" "${fn}${ARG_SUFFIX}${ext}"
-           debug_target_location "${debug_target_location}" )
-  ENDIF()
+
   IF(NOT ARG_COMPONENT)
     SET(ARG_COMPONENT DebugBinaries)
   ENDIF()
@@ -187,20 +252,18 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
     COMPONENT ${ARG_COMPONENT}
     OPTIONAL)
 
-  IF(MSVC)
+  # For windows, install .pdb files for .exe and .dll files.
+  IF(MSVC AND NOT target_type STREQUAL "STATIC_LIBRARY")
     GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
-    STRING(REPLACE "${ext}" ".pdb"  debug_pdb_target_location "${debug_target_location}" )
+    STRING(REPLACE "${ext}" ".pdb"
+      debug_pdb_target_location "${debug_target_location}" )
     IF (RENAME_PARAM)
-      IF(NOT ARG_PDB_DESTINATION)
-        STRING(REPLACE "${ext}" ".pdb"  "${ARG_RENAME}" pdb_rename)
-        SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
-      ENDIF()
-    ENDIF()
-    IF(NOT ARG_PDB_DESTINATION)
-      SET(ARG_PDB_DESTINATION "${ARG_DESTINATION}")
+      STRING(REPLACE "${ext}" ".pdb"  pdb_rename "${ARG_RENAME}")
+      SET(PDB_RENAME_PARAM RENAME "${pdb_rename}")
     ENDIF()
+
     INSTALL(FILES ${debug_pdb_target_location}
-      DESTINATION ${ARG_PDB_DESTINATION}
+      DESTINATION ${ARG_DESTINATION}
       ${PDB_RENAME_PARAM}
       CONFIGURATIONS Release RelWithDebInfo
       COMPONENT ${ARG_COMPONENT}

cmake/libevent.cmake

@@ -19,9 +19,7 @@ MACRO (MYSQL_USE_BUNDLED_LIBEVENT)
   SET(LIBEVENT_FOUND  TRUE)
   ADD_DEFINITIONS("-DHAVE_LIBEVENT1")
   SET(WITH_LIBEVENT "bundled" CACHE STRING "Use bundled libevent")
-  # Use EXCLUDE_FROM_ALL to build only if another component
-  # which dependens on libevent is built
-  ADD_SUBDIRECTORY(libevent EXCLUDE_FROM_ALL)
+  ADD_SUBDIRECTORY(libevent)
   GET_TARGET_PROPERTY(src libevent SOURCES)
   FOREACH(file ${src})
     SET(LIBEVENT_SOURCES ${LIBEVENT_SOURCES} ${CMAKE_SOURCE_DIR}/libevent/${file})

cmake/libutils.cmake

@@ -228,9 +228,6 @@ MACRO(MERGE_CONVENIENCE_LIBRARIES)
   SET(LIBS ${ARG_DEFAULT_ARGS})
   LIST(REMOVE_AT LIBS 0)
 
-  MESSAGE(STATUS "MERGE_CONVENIENCE_LIBRARIES TARGET ${TARGET}")
-  MESSAGE(STATUS "MERGE_CONVENIENCE_LIBRARIES LIBS ${LIBS}")
-
   SET(SOURCE_FILE
     ${CMAKE_BINARY_DIR}/archive_output_directory/${TARGET}_depends.c)
   ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE})

cmake/mysql_add_executable.cmake

@@ -1,5 +1,5 @@
 # Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
@@ -17,12 +17,11 @@
 # Usage (same as for standard CMake's ADD_EXECUTABLE)
 #
 # MYSQL_ADD_EXECUTABLE(target source1...sourceN)
-#
 # MySQL specifics:
-# - instruct CPack to install executable under ${CMAKE_INSTALL_PREFIX}/bin directory
+# - instruct CPack to install executable under
+#   ${CMAKE_INSTALL_PREFIX}/bin directory
 # On Windows :
 # - add version resource
-# - instruct CPack to do autenticode signing if SIGNCODE is set
 
 INCLUDE(cmake_parse_arguments)