diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-27 17:12:28 +0200 |
| commit | 7ae37ff74fc18c391bd0d3fd1fbf6afafe966435 (patch) | |
| tree | 792d8852dd9aaa06b5ddfb374f02774b18ed150c /sql/sql_test.cc | |
| parent | d1ff2c583f452d8e1899f800609c329c998f0a33 (diff) | |
| parent | 3157fa182accab86a4dea45edbcbca4eb5157723 (diff) | |
| download | mariadb-git-7ae37ff74fc18c391bd0d3fd1fbf6afafe966435.tar.gz | |
Merge 10.3 into 10.4
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 54eed6e4c90..ca3b9a759b7 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\ |