From 9af4c7c6d7420e71f323b7b582c47bc2e43fc68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 1 Mar 2022 09:12:15 +0200 Subject: [PATCH] MDEV-27964: A better work-around Already the detection part of have_crypt.inc must be skipped in WITH_MSAN builds until the SIGSEGV in the crypt() interceptor has been fixed. --- mysql-test/include/have_crypt.inc | 2 ++ mysql-test/main/func_crypt.test | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/include/have_crypt.inc b/mysql-test/include/have_crypt.inc index 422f8922edca8..ae94121980cf7 100644 --- a/mysql-test/include/have_crypt.inc +++ b/mysql-test/include/have_crypt.inc @@ -1,3 +1,5 @@ +# MDEV-27964 The function ENCRYPT() causes SIGSEGV in WITH_MSAN builds +-- source include/not_msan.inc # encrypt('a') is NULL if crypt(3) is not available # encrypt('a') is "*0" in fips mode if (`select length(encrypt('a')) > 3 IS NOT TRUE`) { diff --git a/mysql-test/main/func_crypt.test b/mysql-test/main/func_crypt.test index 7da3f0c0f98f3..907376049d868 100644 --- a/mysql-test/main/func_crypt.test +++ b/mysql-test/main/func_crypt.test @@ -1,6 +1,4 @@ -- source include/have_crypt.inc -# MDEV-27964 The function ENCRYPT() causes SIGSEGV in WITH_MSAN builds --- source include/not_msan.inc --disable_warnings drop table if exists t1;