Merge 10.5 into 10.6

libmariadb @ 8574d0b8

-Subproject commit ffa3451fa511ad27164356bd8c620032eba65511
+Subproject commit 8574d0b840df8e5b1bf64030f5d94ea9bd540e66

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()
@@ -21821,10 +21818,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 },