diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
| commit | 5e01255732f554bbf473347566439fd18c006756 (patch) | |
| tree | f174de61c99f8b6428395b0275e885ee500365b6 /sql/sql_test.cc | |
| parent | 6c3b1dced41c238f814aeabbc725e31c3106c0f4 (diff) | |
| parent | d84a2826290d9676faebba0849d1b9fb7f5efcd8 (diff) | |
| download | mariadb-git-5e01255732f554bbf473347566439fd18c006756.tar.gz | |
Merge 10.11 into 11.0
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 6c2bbedef6d..a0b445f3bea 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -628,6 +628,10 @@ Next alarm time: %lu\n", #elif defined(HAVE_MALLINFO) struct mallinfo info= mallinfo(); #endif +#if __has_feature(memory_sanitizer) + /* Work around missing MSAN instrumentation */ + MEM_MAKE_DEFINED(&info, sizeof info); +#endif #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) char llbuff[10][22]; printf("\nMemory status:\n\ |