diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:16:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:16:42 +0300 |
| commit | dd2fe81122224c07a65e89b409dc28d70802fe99 (patch) | |
| tree | b3737b6d5a89e34fa30aea32843a8a78704e4b23 /sql/sql_test.cc | |
| parent | e4b83f0febbd24b04687d4814871c758cbede111 (diff) | |
| parent | 0760ad3336521b85454b522390eb972a606def23 (diff) | |
| download | mariadb-git-dd2fe81122224c07a65e89b409dc28d70802fe99.tar.gz | |
Merge 10.6 into 10.8
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 0d1a8313564..479d4289406 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\ |