Merge branch '10.11' into 11.4

Author: vuvova

CMakeLists.txt

@@ -347,7 +347,13 @@ SET(WITH_SAFEMALLOC "AUTO" CACHE STRING "Use safemalloc memory debugger. Will re
 
 IF(WITH_SAFEMALLOC MATCHES "ON")
   ADD_DEFINITIONS( -DSAFEMALLOC)
-ELSEIF(WITH_SAFEMALLOC MATCHES "AUTO" AND NOT WIN32 AND NOT WITH_VALGRIND)
+ELSEIF(WITH_SAFEMALLOC MATCHES "AUTO"
+       AND NOT WIN32
+       AND NOT WITH_VALGRIND
+       AND NOT WITH_ASAN
+       AND NOT WITH_UBSAN
+       AND NOT WITH_TSAN
+       AND NOT WITH_MSAN)
   SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC")
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC")
 ENDIF()

client/mysql.cc

@@ -3208,6 +3208,26 @@ static int reconnect(void)
   return 0;
 }
 
+#ifndef EMBEDDED_LIBRARY
+static void status_info_cb(void *data, enum enum_mariadb_status_info type, ...)
+{
+  va_list ap;
+  va_start(ap, type);
+  if (type == SESSION_TRACK_TYPE && va_arg(ap, int) == SESSION_TRACK_SCHEMA)
+  {
+    MARIADB_CONST_STRING *val= va_arg(ap, MARIADB_CONST_STRING *);
+    my_free(current_db);
+    if (val->length)
+      current_db= my_strndup(PSI_NOT_INSTRUMENTED, val->str, val->length, MYF(MY_FAE));
+    else
+      current_db= NULL;
+  }
+  va_end(ap);
+}
+#else
+#define mysql_optionsv(A,B,C,D) do { } while(0)
+#endif
+
 static void get_current_db()
 {
   MYSQL_RES *res;
@@ -5021,6 +5041,8 @@ sql_real_connect(char *host,char *database,char *user,char *password,
     mysql_close(&mysql);
   }
   mysql_init(&mysql);
+  if (!one_database)
+    mysql_optionsv(&mysql, MARIADB_OPT_STATUS_CALLBACK, status_info_cb, NULL);
   if (opt_init_command)
     mysql_options(&mysql, MYSQL_INIT_COMMAND, opt_init_command);
   if (opt_connect_timeout)

client/mysqlbinlog.cc

@@ -1034,9 +1034,16 @@ Exit_status process_event(PRINT_EVENT_INFO *print_event_info, Log_event *ev,
         binlog, even if they have a server_id.  Also, we have to read
         the format_description event so that we can parse subsequent
         events.
+        Don't skip Unknown events either since we don't know their `server_id`s.
       */
-      if (ev_type != ROTATE_EVENT && is_server_id_excluded(ev->server_id))
-        goto end;
+      switch (ev_type) {
+      case ROTATE_EVENT:
+      case UNKNOWN_EVENT:
+        break;
+      default:
+        if (is_server_id_excluded(ev->server_id))
+          goto end;
+      }
     }
     if ((ev->when >= stop_datetime)
         || (pos >= stop_position_mot))
@@ -3394,7 +3401,8 @@ int main(int argc, char** argv)
   }
 
   /*
-    Emit a warning if we finished processing input before reaching the stop
+    Emit warning(s) (in Gtid_event_filter::verify_completed_state() for GTID(s))
+    if we finished processing input before reaching the stop
     boundaries indicated by --stop-datetime or --stop-position.
   */
   if (stop_datetime != MY_TIME_T_MAX &&
@@ -3405,6 +3413,8 @@ int main(int argc, char** argv)
       stop_position > last_processed_ev.position)
     warning("Did not reach stop position %llu before end of input",
             stop_position);
+  if (position_gtid_filter)
+    position_gtid_filter->verify_final_state();
 
   /*
     If enable flashback, need to print the events from the end to the

client/mysqldump.cc

@@ -184,7 +184,7 @@ static DYNAMIC_STRING extended_row;
 static DYNAMIC_STRING dynamic_where;
 static MYSQL_RES *get_table_name_result= NULL;
 static MEM_ROOT glob_root;
-static MYSQL_RES *routine_res, *routine_list_res;
+static MYSQL_RES *routine_res, *routine_list_res, *slave_status_res= NULL;
 
 
 #include <sslopt-vars.h>
@@ -1910,6 +1910,8 @@ static void free_resources()
     mysql_free_result(routine_res);
   if (routine_list_res)
     mysql_free_result(routine_list_res);
+  if (slave_status_res)
+    mysql_free_result(slave_status_res);
   if (mysql)
   {
     mysql_close(mysql);
@@ -6291,17 +6293,19 @@ static int do_show_master_status(MYSQL *mysql_con, int consistent_binlog_pos,
 
 static int do_stop_slave_sql(MYSQL *mysql_con)
 {
-  MYSQL_RES *slave;
   MYSQL_ROW row;
+  DBUG_ASSERT(
+    !slave_status_res // do_stop_slave_sql() should only be called once
+  );
 
-  if (mysql_query_with_error_report(mysql_con, &slave,
+  if (mysql_query_with_error_report(mysql_con, &slave_status_res,
                                     multi_source ?
                                     "SHOW ALL SLAVES STATUS" :
                                     "SHOW SLAVE STATUS"))
     return(1);
 
   /* Loop over all slaves */
-  while ((row= mysql_fetch_row(slave)))
+  while ((row= mysql_fetch_row(slave_status_res)))
   {
     if (row[11 + multi_source])
     {
@@ -6316,13 +6320,11 @@ static int do_stop_slave_sql(MYSQL *mysql_con)
 
         if (mysql_query_with_error_report(mysql_con, 0, query))
         {
-          mysql_free_result(slave);
           return 1;
         }
       }
     }
   }
-  mysql_free_result(slave);
   return(0);
 }
 
@@ -6446,32 +6448,35 @@ static int do_show_slave_status(MYSQL *mysql_con, int have_mariadb_gtid,
 
 static int do_start_slave_sql(MYSQL *mysql_con)
 {
-  MYSQL_RES *slave;
   MYSQL_ROW row;
   int error= 0;
   DBUG_ENTER("do_start_slave_sql");
 
-  /* We need to check if the slave sql is stopped in the first place */
-  if (mysql_query_with_error_report(mysql_con, &slave,
-                                    multi_source ?
-                                    "SHOW ALL SLAVES STATUS" :
-                                    "SHOW SLAVE STATUS"))
-    DBUG_RETURN(1);
+  /*
+    do_start_slave_sql() should normally be called
+    sometime after do_stop_slave_sql() succeeds
+  */
+  if (!slave_status_res)
+    DBUG_RETURN(error);
+  mysql_data_seek(slave_status_res, 0);
 
-  while ((row= mysql_fetch_row(slave)))
+  while ((row= mysql_fetch_row(slave_status_res)))
   {
     DBUG_PRINT("info", ("Connection: '%s'  status: '%s'",
                         multi_source ? row[0] : "", row[11 + multi_source]));
     if (row[11 + multi_source])
     {
-      /* if SLAVE SQL is not running, we don't start it */
-      if (strcmp(row[11 + multi_source], "Yes"))
+      /*
+        If SLAVE_SQL was not running but is now,
+        we start it anyway to warn the unexpected state change.
+      */
+      if (strcmp(row[11 + multi_source], "No"))
       {
         char query[160];
         if (multi_source)
-          sprintf(query, "START SLAVE '%.80s'", row[0]);
+          sprintf(query, "START SLAVE '%.80s' SQL_THREAD", row[0]);
         else
-          strmov(query, "START SLAVE");
+          strmov(query, "START SLAVE SQL_THREAD");
 
         if (mysql_query_with_error_report(mysql_con, 0, query))
         {
@@ -6482,7 +6487,6 @@ static int do_start_slave_sql(MYSQL *mysql_con)
       }
     }
   }
-  mysql_free_result(slave);
   DBUG_RETURN(error);
 }
 

client/mysqltest.cc

@@ -8733,7 +8733,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
   DYNAMIC_STRING ds_res_1st_execution;
   my_bool ds_res_1st_execution_init = FALSE;
   my_bool compare_2nd_execution = TRUE;
-  int query_match_ps2_re;
+  int query_match_ps2_re, query_match_cursor_re;
   MYSQL_RES *res;
   DBUG_ENTER("run_query_stmt");
   DBUG_PRINT("query", ("'%-.60s'", query));
@@ -8792,6 +8792,9 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
     parameter markers.
   */
 
+  query_match_cursor_re= cursor_protocol_enabled && cn->stmt->field_count &&
+                         match_re(&cursor_re, query);
+
   if (cursor_protocol_enabled)
   {
     ps2_protocol_enabled = 0;
@@ -8800,7 +8803,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
       Use cursor for queries matching the filter,
       else reset cursor type
     */
-    if (match_re(&cursor_re, query))
+    if (query_match_cursor_re)
     {
       /*
       Use cursor when retrieving result
@@ -8812,12 +8815,13 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
     }
   }
 
-  query_match_ps2_re = match_re(&ps2_re, query);
+  query_match_ps2_re = ps2_protocol_enabled && cn->stmt->field_count &&
+                       match_re(&ps2_re, query);
 
   /*
     Execute the query first time if second execution enable
   */
-  if (ps2_protocol_enabled && query_match_ps2_re)
+  if (query_match_ps2_re)
   {
     if (do_stmt_execute(cn))
     {
@@ -8873,8 +8877,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
       and keep them in a separate string for later. Cursor_protocol is used
       only for queries matching the filter "cursor_re".
     */
-    if (cursor_protocol_enabled && match_re(&cursor_re, query) &&
-        !disable_warnings)
+    if (query_match_cursor_re && !disable_warnings)
       append_warnings(&ds_execute_warnings, mysql);
 
     if (read_stmt_results(stmt, ds, command))
@@ -8886,7 +8889,7 @@ void run_query_stmt(struct st_connection *cn, struct st_command *command,
         The results of the first and second execution are compared
         only if result logging is enabled
       */
-      if (compare_2nd_execution && ps2_protocol_enabled && query_match_ps2_re)
+      if (compare_2nd_execution && query_match_ps2_re)
       {
         if (ds->length != ds_res_1st_execution.length ||
            !(memcmp(ds_res_1st_execution.str, ds->str, ds->length) == 0))

cmake/aws_sdk.cmake

@@ -4,19 +4,27 @@ MACRO (SKIP_AWS_SDK MSG)
   RETURN()
 ENDMACRO()
 
-FUNCTION (CHECK_AWS_SDK RETVAL REASON)
+FUNCTION (CHECK_AWS_SDK COMPONENTS RETVAL REASON)
   # AWS_SDK_EXTERNAL_PROJECT must be ON
   IF(NOT AWS_SDK_EXTERNAL_PROJECT)
-    SKIP_AWS_SDK("AWS_SDK_EXTERNAL_PROJECT is not ON")
+   FOREACH(comp ${COMPONENTS})
+    FIND_PACKAGE(aws-cpp-sdk-${comp} CONFIG QUIET)
+    IF (NOT aws-cpp-sdk-${comp}_FOUND)
+      SKIP_AWS_SDK("AWS_SDK_EXTERNAL_PROJECT is not ON and aws-cpp-sdk-${comp} not found")
+    ENDIF()
+   ENDFOREACH()
+   SET(${RETVAL} ON PARENT_SCOPE)
   ENDIF()
   IF(NOT NOT_FOR_DISTRIBUTION)
     SKIP_AWS_SDK("AWS SDK has Apache 2.0 License which is not compatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need it")
   ENDIF()
+  IF(CMAKE_VERSION VERSION_LESS "3.15")
+    SKIP_AWS_SDK("CMake too old")
+  ENDIF()
   # Check compiler support
   IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-    IF (GCC_VERSION VERSION_LESS 4.8)
-      SKIP_AWS_SDK("GCC VERSION too old (${GCC_VERSION}, required is 4.8 or later")
+    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+      SKIP_AWS_SDK("GCC VERSION too old (${GCC_VERSION}, required is 4.9 or later")
     ENDIF()
   ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     IF ((CMAKE_CXX_COMPILER_VERSION AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS  3.3) OR
@@ -36,35 +44,27 @@ FUNCTION (CHECK_AWS_SDK RETVAL REASON)
     SKIP_AWS_SDK("OS unsupported by AWS SDK")
   ENDIF()
 
-  # Build from source, using ExternalProject_Add
-  # AWS C++ SDK requires cmake 2.8.12
-  IF(CMAKE_VERSION VERSION_LESS "2.8.12")
-    SKIP_AWS_SDK("CMake is too old")
-  ENDIF()
-
   IF(UNIX)
-    # Check librairies required for building SDK
-    FIND_PACKAGE(CURL)
-    SET_PACKAGE_PROPERTIES(CURL PROPERTIES TYPE REQUIRED)
-    IF(NOT CURL_FOUND)
-      SKIP_AWS_SDK("AWS C++ SDK requires libcurl development package")
+    IF("${WITH_ZLIB}" STREQUAL "bundled")
+      # Breaks FIND_PACKAGE(ZLIB)
+      SKIP_AWS_SDK("Incompatible with WITH_ZLIB=bundled")
     ENDIF()
-    FIND_PATH(UUID_INCLUDE_DIR uuid/uuid.h)
-    IF(NOT UUID_INCLUDE_DIR)
-      SKIP_AWS_SDK("AWS C++ SDK requires uuid development package")
-    ENDIF()
-    IF(NOT APPLE)
-      FIND_LIBRARY(UUID_LIBRARIES uuid)
-      SET_PACKAGE_PROPERTIES(UUID_LIBRARIES PROPERTIES TYPE REQUIRED)
-      IF(NOT UUID_LIBRARIES)
-        SKIP_AWS_SDK("AWS C++ SDK requires uuid development package")
+    # Check libraries required for building SDK
+    FOREACH(pkg CURL ZLIB OpenSSL)
+      FIND_PACKAGE(${pkg})
+      IF(NOT ${pkg}_FOUND)
+        SKIP_AWS_SDK("AWS C++ SDK requires ${pkg}")
       ENDIF()
-      FIND_PACKAGE(OpenSSL)
-      SET_PACKAGE_PROPERTIES(OpenSSL PROPERTIES TYPE REQUIRED)
-      IF(NOT OPENSSL_FOUND)
-        SKIP_AWS_SDK("AWS C++ SDK requires openssl development package")
+      SET_PACKAGE_PROPERTIES(${pkg} PROPERTIES TYPE REQUIRED)
+    ENDFOREACH()
+    # Also check for required libraries explicitely - they might be
+    # missing, even if check above succeeds, e.g when using own copy
+    # of zlib
+    FOREACH(lib OpenSSL::Crypto ZLIB::ZLIB CURL::libcurl)
+      IF(NOT TARGET ${lib})
+        SKIP_AWS_SDK("AWS C++ SDK requires ${lib}")
       ENDIF()
-    ENDIF()
+    ENDFOREACH()
   ENDIF()
   SET(${RETVAL} ON PARENT_SCOPE)
 ENDFUNCTION()
@@ -85,14 +85,4 @@ FUNCTION(USE_AWS_SDK_LIBS)
     SET_PROPERTY(GLOBAL PROPERTY AWS_SDK_LIBS ${comp} APPEND)
     TARGET_LINK_LIBRARIES(${target} aws-cpp-sdk-${comp})
   ENDFOREACH()
-  TARGET_LINK_LIBRARIES(${target} aws-cpp-sdk-core)
-  TARGET_INCLUDE_DIRECTORIES(${target} PRIVATE ${PROJECT_BINARY_DIR}/extra/aws_sdk/aws_sdk_cpp/include)
-  # Link OS libraries that AWS SDK depends on
-  IF(WIN32)
-    TARGET_LINK_LIBRARIES(${target} bcrypt winhttp wininet userenv version)
-  ELSE()
-    FIND_PACKAGE(CURL REQUIRED)
-    FIND_PACKAGE(OpenSSL REQUIRED)
-    TARGET_LINK_LIBRARIES(${target} ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${UUID_LIBRARIES})
-  ENDIF()
 ENDFUNCTION()

cmake/build_configurations/mysql_release.cmake

@@ -118,7 +118,10 @@ ELSEIF(DEB)
   SET(WITH_ZLIB system CACHE STRING "")
   SET(WITH_LIBWRAP ON)
   SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
-  SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
+  # No hurd implementation
+  IF(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "i686-AT386")
+    SET(PLUGIN_AUTH_SOCKET YES CACHE STRING "")
+  ENDIF()
   SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
   SET(WITH_PCRE system CACHE STRING "")
   SET(CLIENT_PLUGIN_ZSTD OFF)

cmake/os/WindowsCache.cmake

@@ -361,4 +361,5 @@ SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "")
 SET(OFF64_T CACHE INTERNAL "")
 SET(Z_HAVE_UNISTD_H CACHE INTERNAL "")
 SET(HAVE_OFF64_T CACHE FALSE INTERNAL "")
+SET(HAVE_AUXV_GETAUXVAL CACHE INTERNAL "")
 ENDIF(MSVC)

cmake/plugin.cmake

@@ -161,6 +161,9 @@ MACRO(MYSQL_ADD_PLUGIN)
             PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY${version_string}")
         ENDIF()
         ADD_DEPENDENCIES(${target}_embedded GenError ${ARG_DEPENDS})
+        IF(ARG_LINK_LIBRARIES)
+          TARGET_LINK_LIBRARIES (${target}_embedded ${ARG_LINK_LIBRARIES})
+        ENDIF()
       ENDIF()
     ENDIF()