From 1146b5cb58d258d15f59558cc10caffc2f29f79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Tue, 5 Oct 2021 16:49:30 +0300
Subject: [PATCH] MDEV-26761: main.mysql_client_test fails with MemorySanitizer

Updated libmariadb and enable the test.
---
 libmariadb                |  2 +-
 tests/mysql_client_test.c | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/libmariadb b/libmariadb
index b99172386a7..33853036dd2 160000
--- a/libmariadb
+++ b/libmariadb
@@ -1 +1 @@
-Subproject commit b99172386a740ef0c8136e9a6cd7d9ad9a77b31f
+Subproject commit 33853036dd2793ecdf36a2b6978c5d114ddd76c7
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 3cc96193e4a..07ef2e0f2ac 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -21194,10 +21194,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()
@@ -21689,10 +21686,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 },