Avoid some failures WITH_MSAN

6 files changed, 49 insertions, 40 deletions

diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result
index 682f2cc9d82..755de4336b9 100644
--- a/mysql-test/main/alter_table.result
+++ b/mysql-test/main/alter_table.result
@@ -3415,23 +3415,5 @@ ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITH
 delete from t1 where a = 11;
 drop table t1;
 #
-# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
-# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
-#
-SET @max_session_mem_used_save= @@max_session_mem_used;
-CREATE TABLE t1 (a INT);
-SELECT * FROM t1;
-a
-ALTER TABLE x MODIFY xx INT;
-ERROR 42S02: Table 'test.x' doesn't exist
-SET SESSION max_session_mem_used= 8192;
-LOCK TABLE t1 WRITE;
-ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
-Warnings:
-Note	1054	Unknown column 'b' in 't1'
-SET SESSION max_session_mem_used = @max_session_mem_used_save;
-UNLOCK TABLES;
-DROP TABLE t1;
-#
 # End of 10.5 tests
 #
diff --git a/mysql-test/main/alter_table.test b/mysql-test/main/alter_table.test
index cc17c3efec9..1bff20a7bd7 100644
--- a/mysql-test/main/alter_table.test
+++ b/mysql-test/main/alter_table.test
@@ -2662,27 +2662,5 @@ delete from t1 where a = 11;
 drop table t1;
 
 --echo #
---echo # MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
---echo # Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
---echo #
-
-SET @max_session_mem_used_save= @@max_session_mem_used;
-
-CREATE TABLE t1 (a INT);
-SELECT * FROM t1;
-
---error ER_NO_SUCH_TABLE
-ALTER TABLE x MODIFY xx INT;
-
-SET SESSION max_session_mem_used= 8192;
-LOCK TABLE t1 WRITE;
-
-ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
-
-SET SESSION max_session_mem_used = @max_session_mem_used_save;
-UNLOCK TABLES;
-DROP TABLE t1;
-
---echo #
 --echo # End of 10.5 tests
 --echo #
diff --git a/mysql-test/main/alter_table_lock.result b/mysql-test/main/alter_table_lock.result
new file mode 100644
index 00000000000..ce6097c9ada
--- /dev/null
+++ b/mysql-test/main/alter_table_lock.result
@@ -0,0 +1,19 @@
+#
+# MDEV-23836: Assertion `! is_set() || m_can_overwrite_status' in
+# Diagnostics_area::set_error_status (interrupted ALTER TABLE under LOCK)
+#
+SET @max_session_mem_used_save= @@max_session_mem_used;
+CREATE TABLE t1 (a INT);
+SELECT * FROM t1;
+a
+ALTER TABLE x MODIFY xx INT;
+ERROR 42S02: Table 'test.x' doesn't exist
+SET SESSION max_session_mem_used= 8192;
+LOCK TABLE t1 WRITE;
+ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+Warnings:
+Note	1054	Unknown column 'b' in 't1'
+SET SESSION max_session_mem_used = @max_session_mem_used_save;
+UNLOCK TABLES;
+DROP TABLE t1;
+# End of 10.5 tests
diff --git a/mysql-test/main/alter_table_lock.test b/mysql-test/main/alter_table_lock.test
new file mode 100644
index 00000000000..f1f60e38b61
--- /dev/null
+++ b/mysql-test/main/alter_table_lock.test
@@ -0,0 +1,25 @@
+--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)
+--echo #
+
+SET @max_session_mem_used_save= @@max_session_mem_used;
+
+CREATE TABLE t1 (a INT);
+SELECT * FROM t1;
+
+--error ER_NO_SUCH_TABLE
+ALTER TABLE x MODIFY xx INT;
+
+SET SESSION max_session_mem_used= 8192;
+LOCK TABLE t1 WRITE;
+
+ALTER TABLE t1 CHANGE COLUMN IF EXISTS b c INT;
+
+SET SESSION max_session_mem_used = @max_session_mem_used_save;
+UNLOCK TABLES;
+DROP TABLE t1;
+
+--echo # End of 10.5 tests
diff --git a/mysql-test/main/cte_recursive.test b/mysql-test/main/cte_recursive.test
index f8c41dbc3ea..5964c32061b 100644
--- a/mysql-test/main/cte_recursive.test
+++ b/mysql-test/main/cte_recursive.test
@@ -1,4 +1,7 @@
 --source include/default_optimizer_switch.inc
+# This is too slow on MSAN
+--source include/not_msan.inc
+--source include/not_valgrind.inc
 
 create table t1 (a int, b varchar(32));
 insert into t1 values
diff --git a/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test
index 85beb3ee1d2..40b412ac9bb 100644
--- a/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test
+++ b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test
@@ -6,6 +6,8 @@
 # We are crashing the server on purpose
 --source include/not_valgrind.inc
 --source include/not_crashrep.inc
+# This often fails under MSAN builder due timing differences
+--source include/not_msan.inc
 
 # The test does work with any page size, but we want to reduce the
 # test running time by limiting the combinations. The redo log format