Merge branch '10.11' into 11.4

Author: sanja-byelkin

.gitignore

@@ -136,6 +136,7 @@ scripts/mysqld_safe
 scripts/mysqldumpslow
 scripts/mysqlhotcopy
 scripts/mytop
+scripts/print_ddl_recovery_log.pl
 scripts/wsrep_sst_backup
 scripts/wsrep_sst_common
 scripts/wsrep_sst_mysqldump

CMakeLists.txt

@@ -297,7 +297,7 @@ ENDIF()
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
 
-IF(CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10")
   # Enable extra checks when using a recent enough version of GNU libstdc++
   SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG -D_GLIBCXX_ASSERTIONS")
 ENDIF()

client/mysqlcheck.c

@@ -890,6 +890,9 @@ static int disable_binlog()
 }
 
 
+/* Ok as mysqlcheck is not multi threaded */
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 static int handle_request_for_tables(char *tables, size_t length,
                                      my_bool view, my_bool dont_quote)
 {
@@ -1021,9 +1024,6 @@ static void insert_table_name(DYNAMIC_ARRAY *arr, char *in, size_t dblen)
   insert_dynamic(arr, (uchar*) buf);
 }
 
-/* Ok as mysqlcheck is not multi threaded */
-PRAGMA_DISABLE_CHECK_STACK_FRAME
-
 static void __attribute__((noinline)) print_result()
 {
   MYSQL_RES *res;

client/mysqlslap.c

@@ -419,6 +419,8 @@ int main(int argc, char **argv)
   return 0;
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
+
 void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
 {
   unsigned int x;
@@ -514,6 +516,7 @@ void concurrency_loop(MYSQL *mysql, uint current, option_string *eptr)
   my_free(head_sptr);
 
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME
 
 
 static struct my_option my_long_options[] =
@@ -2279,6 +2282,7 @@ statement_cleanup(statement *stmt)
   }
 }
 
+PRAGMA_DISABLE_CHECK_STACK_FRAME
 
 int 
 slap_connect(MYSQL *mysql)
@@ -2312,3 +2316,4 @@ slap_connect(MYSQL *mysql)
 
   return 0;
 }
+PRAGMA_REENABLE_CHECK_STACK_FRAME

client/mysqltest.cc

@@ -2860,6 +2860,7 @@ do_result_format_version(struct st_command *command)
   dynstr_append_mem(&ds_res, ds_version.str, ds_version.length);
   dynstr_append_mem(&ds_res, STRING_WITH_LEN("\n"));
   dynstr_free(&ds_version);
+  DBUG_VOID_RETURN;
 }
 
 

cmake/build_configurations/mysql_release.cmake

@@ -171,7 +171,7 @@ ENDIF()
 IF(UNIX)  
 
   # Default GCC flags
-  IF(CMAKE_COMPILER_IS_GNUCC)
+  IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing  -Wno-uninitialized")
     STRING(APPEND CMAKE_C_FLAGS_DEBUG          " ${COMMON_C_FLAGS}")
     STRING(APPEND CMAKE_C_FLAGS_RELEASE        " ${COMMON_C_FLAGS}")
@@ -180,7 +180,7 @@ IF(UNIX)
     STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
     STRING(REGEX REPLACE "-O2" "-O3" CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
   ENDIF()
-  IF(CMAKE_COMPILER_IS_GNUCXX)
+  IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing -Wno-uninitialized")
     STRING(APPEND CMAKE_CXX_FLAGS_DEBUG          " ${COMMON_CXX_FLAGS}")
     STRING(APPEND CMAKE_CXX_FLAGS_RELEASE        " ${COMMON_CXX_FLAGS}")
@@ -200,11 +200,11 @@ IF(UNIX)
       SET(z_flags "")
     ENDIF()
 
-    IF(CMAKE_COMPILER_IS_GNUCC)
+    IF(CMAKE_C_COMPILER_ID STREQUAL "GNU")
       STRING(APPEND CMAKE_C_FLAGS_RELEASE " ${z_flags}")
       STRING(APPEND CMAKE_C_FLAGS_RELWITHDEBINFO " ${z_flags}")
     ENDIF()
-    IF(CMAKE_COMPILER_IS_GNUCXX)
+    IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
       STRING(APPEND CMAKE_CXX_FLAGS_RELEASE " ${z_flags}")
       STRING(APPEND CMAKE_CXX_FLAGS_RELWITHDEBINFO " ${z_flags}")
     ENDIF()

cmake/dtrace.cmake

@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1335  USA 
 
-IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
+IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
   AND CMAKE_SIZEOF_VOID_P EQUAL 4)
   IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
     EXECUTE_PROCESS(

cmake/maintainer.cmake

@@ -42,6 +42,10 @@ SET(MY_WARNING_FLAGS
   -Wcast-function-type-strict
   )
 
+IF(NOT (WITH_MSAN OR WITH_ASAN OR WITH_UBSAN))
+  SET(MY_WARNING_FLAGS ${MY_WARNING_FLAGS} -Wframe-larger-than=16384)
+ENDIF()
+
 # Warning flags that are in testing before moving
 # to MY_WARNING_FLAGS if stable.
 SET(MY_WARNING_FLAGS_NON_FATAL
@@ -58,7 +62,7 @@ ENDFOREACH()
 
 SET(MY_ERROR_FLAGS -Werror -fno-operator-names -Wsuggest-override)
 
-IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_LESS "6.0.0")
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=maybe-uninitialized)
   SET(MY_ERROR_FLAGS ${MY_ERROR_FLAGS} -Wno-error=non-virtual-dtor) # gcc bug 7302
 ENDIF()

cmake/os/SunOS.cmake

@@ -69,8 +69,8 @@ CHECK_C_SOURCE_RUNS(
 
 
 # Check is special processor flag needs to be set on older GCC
-#that defaults to v8 sparc . Code here is taken from my_rdtsc.h
-IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_SIZEOF_VOID_P EQUAL 4
+# that defaults to v8 sparc . Code here is taken from my_rdtsc.h
+IF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_SIZEOF_VOID_P EQUAL 4
   AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
   SET(SOURCE
   "

extra/CMakeLists.txt

@@ -82,6 +82,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
       )
 
 
+  # clang ~16+ with return values being undefined is resolved by basic optimization
+  # compiler flags for the function mach_read_from_2 (per MDEV-36316)
+  IF(WITH_MSAN AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+      SET_SOURCE_FILES_PROPERTIES(
+          ${INNOBASE_SOURCES}
+          innochecksum.cc
+          PROPERTIES COMPILE_FLAGS -Og)
+  ENDIF()
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
   TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
   ADD_DEPENDENCIES(innochecksum GenError)