diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 19:28:18 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 19:28:18 +0300 |
| commit | b7ff385d43c94b1d78a48a6ebe0a031ffae2c97f (patch) | |
| tree | 56430ecbcb16b2ab8e9e605ada6865ecda6521ab /tests/mysql_client_test.c | |
| parent | 9791d4b4afb591b1899b0612cc6df031fba8d746 (diff) | |
| parent | c073c9a930b23a6a02ef301235f921c28cbb7d26 (diff) | |
| download | mariadb-git-b7ff385d43c94b1d78a48a6ebe0a031ffae2c97f.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'tests/mysql_client_test.c')
| -rw-r--r-- | tests/mysql_client_test.c | 10 |
1 files changed, 2 insertions, 8 deletions
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 }, |