summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-06 08:45:42 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-06 08:45:42 +0300
commit8d6421aa48de5f1581e0706cc65c3515954bcead (patch)
treedb868910eee7f4b2d661c4a820b5d9e59d608830
parentf54bc7deb7db49ba3719da4a8acfa52819d11777 (diff)
downloadmariadb-git-8d6421aa48de5f1581e0706cc65c3515954bcead.tar.gz
MemorySanitizer: Disable tests that time out
-rw-r--r--mysql-test/main/ssl-big.test2
-rw-r--r--mysql-test/suite/innodb/t/alter_large_dml.test2
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/ssl-big.test b/mysql-test/main/ssl-big.test
index 367cbcba2d7..a23f3028f02 100644
--- a/mysql-test/main/ssl-big.test
+++ b/mysql-test/main/ssl-big.test
@@ -4,6 +4,8 @@
-- source include/have_ssl_communication.inc
-- source include/big_test.inc
-- source include/have_64bit.inc
+# This test often times out with MemorySanitizer.
+--source include/not_msan.inc
# Save the initial number of concurrent sessions
--source include/count_sessions.inc
diff --git a/mysql-test/suite/innodb/t/alter_large_dml.test b/mysql-test/suite/innodb/t/alter_large_dml.test
index d8b288e5a9f..7320fa008af 100644
--- a/mysql-test/suite/innodb/t/alter_large_dml.test
+++ b/mysql-test/suite/innodb/t/alter_large_dml.test
@@ -5,6 +5,8 @@
--source include/have_debug.inc
--source include/have_debug_sync.inc
--source include/have_sequence.inc
+# This test often times out with MemorySanitizer.
+--source include/not_msan.inc
CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200),
f4 char(200), f5 char(200), f6 char(200),