summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2021-03-17 10:35:04 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2021-03-17 10:35:04 +0100
commitdfa6fba9595ae7fd5cb312d8c35aa6930a955d9f (patch)
tree5e161925c4e6c6f259f8967390c9cbfd98a6009c
parent825c0e2abefb4c20c9f5378f55871cc34fbc83f9 (diff)
downloadmariadb-git-dfa6fba9595ae7fd5cb312d8c35aa6930a955d9f.tar.gz
Skip tests that dump thread_stack, for ASAN
031b3dfc22c3d37 changed thread_stack for ASAN. Skip the tests to avoid the diff
-rw-r--r--mysql-test/main/mysqld--help.test1
-rw-r--r--mysql-test/suite/sys_vars/t/thread_stack_basic.test1
2 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/main/mysqld--help.test b/mysql-test/main/mysqld--help.test
index f32f52c6dd0..f7eb038a6f3 100644
--- a/mysql-test/main/mysqld--help.test
+++ b/mysql-test/main/mysqld--help.test
@@ -2,6 +2,7 @@
# mysqld --help
#
--source include/not_embedded.inc
+--source include/not_asan.inc
--source include/have_perfschema.inc
--source include/have_profiling.inc
--source include/platform.inc
diff --git a/mysql-test/suite/sys_vars/t/thread_stack_basic.test b/mysql-test/suite/sys_vars/t/thread_stack_basic.test
index 41015033fe9..6aeda532fde 100644
--- a/mysql-test/suite/sys_vars/t/thread_stack_basic.test
+++ b/mysql-test/suite/sys_vars/t/thread_stack_basic.test
@@ -1,6 +1,7 @@
#
# only global
#
+--source include/not_asan.inc
--replace_result 392192 299008
select @@global.thread_stack;
--error ER_INCORRECT_GLOBAL_LOCAL_VAR