diff --git a/libmariadb b/libmariadb index ffa3451fa51..8574d0b840d 160000 --- a/libmariadb +++ b/libmariadb @@ -1 +1 @@ -Subproject commit ffa3451fa511ad27164356bd8c620032eba65511 +Subproject commit 8574d0b840df8e5b1bf64030f5d94ea9bd540e66 diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 86485f502ef..16396daf585 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -21197,10 +21197,7 @@ static void test_explain_meta() } -#if __has_feature(memory_sanitizer) -/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */ -#elif defined EMBEDDED_LIBRARY -#else +#ifndef EMBEDDED_LIBRARY #define MDEV19838_MAX_PARAM_COUNT 32 #define MDEV19838_FIELDS_COUNT 17 static void test_mdev19838() @@ -21910,10 +21907,7 @@ static struct my_tests_st my_tests[]= { #endif { "test_ps_params_in_ctes", test_ps_params_in_ctes }, { "test_explain_meta", test_explain_meta }, -#if __has_feature(memory_sanitizer) -/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */ -#elif defined EMBEDDED_LIBRARY -#else +#ifndef EMBEDDED_LIBRARY { "test_mdev19838", test_mdev19838 }, #endif { "test_mdev18408", test_mdev18408 },