1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge 10.8 into 10.9

This commit is contained in:
Marko Mäkelä
2023-03-29 15:28:13 +03:00
113 changed files with 3104 additions and 3031 deletions

View File

@@ -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\