diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:37:42 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:37:42 +0200 |
| commit | 80459bcbd4ca2cfd149f58c41428882fcfc49e03 (patch) | |
| tree | 4b6ef6a36cac375104bf1e619e2ec3f5db9a0535 /sql/sql_test.cc | |
| parent | 2e67b9f665875928605880661fc5aa1a15175f53 (diff) | |
| parent | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (diff) | |
| download | mariadb-git-80459bcbd4ca2cfd149f58c41428882fcfc49e03.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/sql_test.cc')
| -rw-r--r-- | sql/sql_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc index 3f1728d334f..3ff23219f87 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -617,8 +617,12 @@ Next alarm time: %lu\n", (ulong)alarm_info.next_alarm_time); #endif display_table_locks(); -#ifdef HAVE_MALLINFO - struct mallinfo info= mallinfo(); +#if defined(HAVE_MALLINFO2) + struct mallinfo2 info = mallinfo2(); +#elif defined(HAVE_MALLINFO) + struct mallinfo info= mallinfo(); +#endif +#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) char llbuff[10][22]; printf("\nMemory status:\n\ Non-mmapped space allocated from system: %s\n\ |