Merge branch '10.6' into 10.11

Author: sanja-byelkin

cmake/maintainer.cmake

@@ -41,9 +41,12 @@ SET(MY_WARNING_FLAGS
   -Wvla
   -Wwrite-strings
   -Wcast-function-type-strict
-  -Wframe-larger-than=16384
   )
 
+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

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)

include/my_attribute.h

@@ -91,9 +91,22 @@ _Pragma("GCC diagnostic ignored \"-Wframe-larger-than=\"")
 #define PRAGMA_REENABLE_CHECK_STACK_FRAME                    \
 _Pragma("GCC diagnostic pop")
 
+/*
+  The following check is for older gcc version that allocates
+  a lot of stack during startup that does not need to be checked
+*/
+
+#if !defined(__clang__) && __GNUC__ < 13
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA PRAGMA_DISABLE_CHECK_STACK_FRAME
 #else
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA
+#endif /* !defined(__clang__) && __GNUC__ < 13 */
+
+#else /*! __GNUC__ */
 #define PRAGMA_DISABLE_CHECK_STACK_FRAME
 #define PRAGMA_REENABLE_CHECK_STACK_FRAME
-#endif
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME
+#define PRAGMA_DISABLE_CHECK_STACK_FRAME_EXTRA
+#endif /* __GNUC__ */
 
 #endif /* _my_attribute_h */

include/my_pthread.h

@@ -668,7 +668,17 @@ extern void my_mutex_end(void);
   We need to have at least 256K stack to handle calls to myisamchk_init()
   with the current number of keys and key parts.
 */
-# if defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN)
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if defined(__clang__) && __has_feature(memory_sanitizer) && !defined(DBUG_OFF)
+/*
+  MSAN in Debug with clang-20.1 required more memory to complete
+  mtr begin/end checks. The result without increase was MSAN
+  errors triggered on a call instruction.
+*/
+#  define DEFAULT_THREAD_STACK	(2L<<20)
+# elif defined(__SANITIZE_ADDRESS__) || defined(WITH_UBSAN)
 /*
   Optimized WITH_ASAN=ON executables produced
   by GCC 12.3.0, GCC 13.2.0, or clang 16.0.6

include/my_time.h

@@ -230,7 +230,6 @@ static inline longlong sec_part_unshift(longlong second_part, uint digits)
 /* Date/time rounding and truncation functions */
 static inline long my_time_fraction_remainder(long nr, uint decimals)
 {
-  DBUG_ASSERT(decimals <= TIME_SECOND_PART_DIGITS);
   return nr % (long) log_10_int[TIME_SECOND_PART_DIGITS - decimals];
 }
 static inline void my_datetime_trunc(MYSQL_TIME *ltime, uint decimals)

mysql-test/include/no_msan_without_big.inc

@@ -0,0 +1,8 @@
+# Slow with MSAN, but if mtr --big-test specified, then it should complete
+if (!$BIG_TEST)
+{
+  if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+  {
+    --skip Can't be run WITH_MSAN unless using --big-test
+  }
+}

mysql-test/include/not_msan.inc

@@ -1,4 +1,5 @@
-# This file should only be used with tests that are too big or slow for MSAN.
+# This file should only be used with tests that are too big or slow for MSAN (even with --big-test).
+# Use no_msan_without_big instead unless this really won't complete in a test timeout period.
 
 if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
 {

mysql-test/include/not_msan_with_debug.inc

@@ -0,0 +1,9 @@
+# This file should only be used with tests that are too big or slow for MSAN with Debug.
+
+if (`select count(*) from information_schema.system_variables where variable_name='have_sanitizer' and global_value like "MSAN%"`)
+{
+  if (`select version() like '%debug%'`)
+  {
+    --skip Can't be run WITH_MSAN and CMAKE_BUILD_TYPE=Debug
+  }
+}

mysql-test/main/alter_table_lock.test

@@ -1,5 +1,3 @@
---source include/not_msan.inc
-
 --echo #
 --echo # MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
 --echo # Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)

mysql-test/main/backup_lock.result

@@ -266,6 +266,7 @@ col1
 SET AUTOCOMMIT = 0;
 UPDATE t_permanent_innodb SET col1 = 9;
 UPDATE t_permanent_aria SET col1 = 9;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 UPDATE t_permanent_myisam SET col1 = 9;
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 UPDATE t_permanent_aria2 SET col1 = 9;