1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Marko Mäkelä 2021-10-05 19:28:18 +03:00
commit b7ff385d43
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

@ -1 +1 @@
Subproject commit ffa3451fa511ad27164356bd8c620032eba65511 Subproject commit 8574d0b840df8e5b1bf64030f5d94ea9bd540e66

10
tests/mysql_client_test.c
View File

@ -21197,10 +21197,7 @@ static void test_explain_meta()
} }
#if __has_feature(memory_sanitizer) #ifndef EMBEDDED_LIBRARY
/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */
#elif defined EMBEDDED_LIBRARY
#else
#define MDEV19838_MAX_PARAM_COUNT 32 #define MDEV19838_MAX_PARAM_COUNT 32
#define MDEV19838_FIELDS_COUNT 17 #define MDEV19838_FIELDS_COUNT 17
static void test_mdev19838() static void test_mdev19838()
@ -21910,10 +21907,7 @@ static struct my_tests_st my_tests[]= {
#endif #endif
{ "test_ps_params_in_ctes", test_ps_params_in_ctes }, { "test_ps_params_in_ctes", test_ps_params_in_ctes },
{ "test_explain_meta", test_explain_meta }, { "test_explain_meta", test_explain_meta },
#if __has_feature(memory_sanitizer) #ifndef EMBEDDED_LIBRARY
/* FIXME: MDEV-26761: main.mysql_client_test fails with MemorySanitizer */
#elif defined EMBEDDED_LIBRARY
#else
{ "test_mdev19838", test_mdev19838 }, { "test_mdev19838", test_mdev19838 },
#endif #endif
{ "test_mdev18408", test_mdev18408 }, { "test_mdev18408", test_mdev18408 },