From 48141f3c1787de941d969ad1e6675611b2b650c2 Mon Sep 17 00:00:00 2001 From: Michael Okoko Date: Fri, 26 Mar 2021 20:48:59 +0100 Subject: Replace mallinfo with mallinfo2 on supported systems `mallinfo` is deprecated since glibc 2.33 and has been replaced by mallinfo2. The deprecation causes building the server to fail if glibc version is > 2.33. Check if mallinfo2 exist on the system and use it instead. --- sql/sql_test.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sql') diff --git a/sql/sql_test.cc b/sql/sql_test.cc index c0e62227665..d877eb21588 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -616,8 +616,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\ -- cgit v1.2.1