database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2021-10-05 17:04:51 +03:00
parent 4ca56e8348 1146b5cb58
commit c073c9a930
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmariadb

Submodule libmariadb updated: ffa3451fa5...8574d0b840

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