From dfa6fba9595ae7fd5cb312d8c35aa6930a955d9f Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 17 Mar 2021 10:35:04 +0100 Subject: [PATCH] Skip tests that dump thread_stack, for ASAN 031b3dfc22c3d37 changed thread_stack for ASAN. Skip the tests to avoid the diff --- mysql-test/main/mysqld--help.test | 1 + mysql-test/suite/sys_vars/t/thread_stack_basic.test | 1 + 2 files changed, 2 insertions(+) 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