Merge branch 'mysql-5.7' into mysql-5.7-cluster-7.6

Change-Id: I573a6db28a036d9fa2582e68b382edf7ef8fe45c

Author: zmur

CMakeLists.txt

@@ -24,30 +24,38 @@
 IF(WIN32)
   # CMake 2.8.12 is needed for Visual Studio 2013
   # CMake 3.1.0 is needed for $<TARGET_PDB_FILE:${target}>
-  CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)
+  # We add ...3.10 to keep cmake 4 happy.
+  CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0...3.10)
 ELSE()
   # There's a bug in unzipping prior to 2.8.2
   # Debian 7 has the oldest cmake we need to support
-  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9)
+  # We add ...3.10 to keep cmake 4 happy.
+  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.9...3.10)
 ENDIF()
 
 # We use CMAKE_SHARED_LIBRARY_<Lang>_FLAGS. See cmake --help-policy CMP0018
 IF(CMAKE_VERSION VERSION_GREATER "2.8.8")
-  CMAKE_POLICY(SET CMP0018 OLD)
+  IF(CMAKE_VERSION VERSION_LESS "4")
+    CMAKE_POLICY(SET CMP0018 OLD)
+  ENDIF()
 ENDIF()
 
 # We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
 IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
    CMAKE_VERSION VERSION_GREATER "2.8.12")
- CMAKE_POLICY(SET CMP0022 OLD)
+  IF(CMAKE_VERSION VERSION_LESS "4")
+    CMAKE_POLICY(SET CMP0022 OLD)
+  ENDIF()
 ENDIF()
 
 # 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 CMP0045 OLD)
- CMAKE_POLICY(SET CMP0042 OLD)
+  IF(CMAKE_VERSION VERSION_LESS "4")
+    CMAKE_POLICY(SET CMP0045 OLD)
+    CMAKE_POLICY(SET CMP0042 OLD)
+  ENDIF()
 ENDIF()
 
 # In CMake 3.12 and above, the
@@ -63,6 +71,11 @@ IF(POLICY CMP0075)
   CMAKE_POLICY(SET CMP0075 OLD)
 ENDIF()
 
+# The exec_program command should not be called
+IF(POLICY CMP0153)
+  CMAKE_POLICY(SET CMP0153 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
 # Will set GIT_EXECUTABLE and GIT_FOUND

cmake/build_configurations/feature_set.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2012, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2012, 2025, Oracle and/or its affiliates.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -26,7 +26,11 @@ SET(FEATURE_SET "community" CACHE STRING
 )
 
 IF(FEATURE_SET AND NOT WITHOUT_SERVER)
-  SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
+  # embedded server cannot be built,
+  # MERGE_CONVENIENCE_LIBRARIES depends on unsupported policies
+  IF(CMAKE_VERSION VERSION_LESS "4")
+    SET(WITH_EMBEDDED_SERVER ON CACHE BOOL "")
+  ENDIF()
 
   # Set these ON by default. They can be disabled with
   # -DWITHOUT_${eng}_STORAGE_ENGINE

extra/libevent/libevent-2.1.11-stable/CMakeLists.txt

@@ -19,7 +19,7 @@
 #       start libevent.sln
 #
 
-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+# cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
 
 if (POLICY CMP0054)
     cmake_policy(SET CMP0054 NEW)

rapid/plugin/group_replication/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -214,6 +214,14 @@ ELSEIF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR
     "-Wno-unused-variable -Wno-unused-function -Wno-conversion -Wno-switch")
 ENDIF()
 
+IF(SOLARIS AND MY_COMPILER_IS_GNU)
+  # rpcgen generates 'void bzero();'
+  ADD_COMPILE_FLAGS(${XCOM_RPCGEN_SOURCES}
+    COMPILE_FLAGS
+    "-Wno-builtin-declaration-mismatch"
+    )
+ENDIF()
+
 IF (WIN32)
   SET(LIBRARIES_TO_LINK ${LZ4_LIBRARY} ${SSL_LIBRARIES} ${TIRPC_LIBRARIES} crypt32)
 ELSE()

sql/item_func.cc

@@ -5108,7 +5108,7 @@ longlong Item_master_gtid_set_wait::val_int()
       null_value= 1;
       DBUG_RETURN(0);
     }
-    mi= channel_map.get_mi(channel_str->ptr());
+    mi= channel_map.get_mi(channel_str->c_ptr_safe());
   }
   else
   {

sql/sql_partition.cc

@@ -834,6 +834,12 @@ static bool handle_list_of_fields(List_iterator<char> it,
       for (i= 0; i < num_key_parts; i++)
       {
         Field *field= table->key_info[primary_key].key_part[i].field;
+        // BLOB/TEXT columns are not allowed in partitioning keys.
+        if (field->flags & BLOB_FLAG)
+        {
+          my_error(ER_BLOB_FIELD_IN_PART_FUNC_ERROR, MYF(0));
+          DBUG_RETURN(TRUE);
+        }
         field->flags|= GET_FIXED_FIELDS_FLAG;
       }
     }

sql/table.cc

@@ -3241,8 +3241,15 @@ int open_table_from_share(THD *thd, TABLE_SHARE *share, const char *alias,
       {
         Field *field= key_part->field= outparam->field[key_part->fieldnr-1];
 
+        /*
+          For spatial indexes, the key parts are assigned the length (4 *
+          sizeof(double)) in mysql_prepare_create_table() and the
+          field->key_length() is set to 0. This makes it appear like a prefixed
+          index. However, prefixed indexes are not allowed on Geometric columns.
+          Hence skipping new field creation for Geometric columns.
+        */
         if (field->key_length() != key_part->length &&
-            !(field->flags & BLOB_FLAG))
+            field->type() != MYSQL_TYPE_GEOMETRY)
         {
           /*
             We are using only a prefix of the column as a key:
@@ -3512,6 +3519,37 @@ int closefrm(TABLE *table, bool free_share)
     error=table->file->ha_close();
   my_free((void *) table->alias);
   table->alias= 0;
+
+  /*
+    Iterate through the Table's Key_info and free its key_part->field if the
+    field is of BLOB type.
+
+    When a prefixed key is present, a new Field object is created in
+    open_table_from_share(). These field objects get destroyed when the Table's
+    mem_root is cleared here later. In case of Field_blob objects,
+    Field_blob::value is allocated on the heap. Thus Field_blob objects are
+    freed here in order to destruct the Field_blob::value object.
+  */
+  KEY *key_info= table->key_info;
+  if (key_info)
+  {
+    KEY_PART_INFO *key_part= key_info->key_part;
+    for (KEY *key_info_end= key_info + table->s->keys; key_info < key_info_end;
+         key_info++)
+    {
+      for (KEY_PART_INFO *key_part_end= key_part + key_info->actual_key_parts;
+           key_part < key_part_end; key_part++)
+      {
+        if (key_part->field && (key_part->field->flags & BLOB_FLAG) &&
+            key_part->field->type() != MYSQL_TYPE_GEOMETRY)
+        {
+          delete key_part->field;
+          key_part->field= 0;
+        }
+      }
+    }
+  }
+
   if (table->field)
   {
     for (Field **ptr=table->field ; *ptr ; ptr++)

storage/innobase/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2006, 2025, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
@@ -194,6 +194,16 @@ IF(MY_COMPILER_IS_GNU AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11)
     COMPILE_FLAGS "-Wno-free-nonheap-object")
 ENDIF()
 
+# On linux: /usr/include/stdio.h:#define BUFSIZ 8192
+# On Solaris: /usr/include/iso/stdio_iso.h:#define    BUFSIZ  1024
+IF(SOLARIS AND MY_COMPILER_IS_GNU)
+  ADD_COMPILE_FLAGS(
+    row/row0import.cc
+    row/row0quiesce.cc
+    COMPILE_FLAGS "-Wno-format-truncation"
+    )
+ENDIF()
+
 MY_CHECK_CXX_COMPILER_FLAG("-Wcast-function-type" HAVE_CAST_FUNCTION_TYPE)
 IF(HAVE_CAST_FUNCTION_TYPE)
   ADD_COMPILE_FLAGS(fts/fts0pars.cc