diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 13:39:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 13:39:28 +0300 |
| commit | 6729dd894cfcb86f97d218fb51c41a461cb2f38a (patch) | |
| tree | 62f5a32a006d3624f0088a4629aeef4f471c7c60 | |
| parent | d2e2d32933823623fa3598c8e2b8a5a322e435bb (diff) | |
| parent | 8d472f2b783e4d67e07caa789ddcc8faf2b01650 (diff) | |
| download | mariadb-git-6729dd894cfcb86f97d218fb51c41a461cb2f38a.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 1 | ||||
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | configure.cmake | 1 | ||||
| -rw-r--r-- | sql/sql_test.cc | 16 | ||||
| -rw-r--r-- | storage/innobase/rem/rem0rec.cc | 4 |
5 files changed, 21 insertions, 2 deletions
diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 6774c61b855..4c7d69bc131 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -92,6 +92,7 @@ SET(HAVE_MADVISE CACHE INTERNAL "") SET(HAVE_MALLINFO CACHE INTERNAL "") SET(HAVE_MALLINFO2 CACHE INTERNAL "") SET(HAVE_MALLOC_H 1 CACHE INTERNAL "") +SET(HAVE_MALLOC_ZONE CACHE INTERNAL "") SET(HAVE_MEMALIGN CACHE INTERNAL "") SET(HAVE_MEMCPY 1 CACHE INTERNAL "") SET(HAVE_MEMMOVE 1 CACHE INTERNAL "") diff --git a/config.h.cmake b/config.h.cmake index 698ea65efd5..ae77d676502 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -171,6 +171,7 @@ #cmakedefine HAVE_DECL_MHA_MAPSIZE_VA 1 #cmakedefine HAVE_MALLINFO 1 #cmakedefine HAVE_MALLINFO2 1 +#cmakedefine HAVE_MALLOC_ZONE 1 #cmakedefine HAVE_MEMCPY 1 #cmakedefine HAVE_MEMMOVE 1 #cmakedefine HAVE_MKSTEMP 1 diff --git a/configure.cmake b/configure.cmake index b76888d640f..3d6ff53164b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -364,6 +364,7 @@ CHECK_FUNCTION_EXISTS (lstat HAVE_LSTAT) CHECK_FUNCTION_EXISTS (madvise HAVE_MADVISE) CHECK_FUNCTION_EXISTS (mallinfo HAVE_MALLINFO) CHECK_FUNCTION_EXISTS (mallinfo2 HAVE_MALLINFO2) +CHECK_FUNCTION_EXISTS (malloc_zone_statistics HAVE_MALLOC_ZONE) CHECK_FUNCTION_EXISTS (memcpy HAVE_MEMCPY) CHECK_FUNCTION_EXISTS (memmove HAVE_MEMMOVE) CHECK_FUNCTION_EXISTS (mkstemp HAVE_MKSTEMP) diff --git a/sql/sql_test.cc b/sql/sql_test.cc index c10d869f9b2..5ea853ade0b 100644 --- a/sql/sql_test.cc +++ b/sql/sql_test.cc @@ -33,6 +33,8 @@ #include <malloc.h> #elif defined(HAVE_MALLINFO) && defined(HAVE_SYS_MALLOC_H) #include <sys/malloc.h> +#elif defined(HAVE_MALLOC_ZONE) +#include <malloc/malloc.h> #endif #ifdef HAVE_EVENT_SCHEDULER @@ -655,6 +657,20 @@ Memory allocated by threads: %s\n", llstr(tmp.global_memory_used, llbuff[8]), llstr(tmp.local_memory_used, llbuff[9])); +#elif defined(HAVE_MALLOC_ZONE) + malloc_statistics_t info; + char llbuff[4][22]; + + malloc_zone_statistics(nullptr, &info); + printf("\nMemory status:\n\ +Total allocated space: %s\n\ +Total free space: %s\n\ +Global memory allocated by server: %s\n\ +Memory allocated by threads: %s\n", + llstr(info.size_allocated, llbuff[0]), + llstr((info.size_allocated - info.size_in_use), llbuff[1]), + llstr(tmp.global_memory_used, llbuff[2]), + llstr(tmp.local_memory_used, llbuff[3])); #endif #ifdef HAVE_EVENT_SCHEDULER diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 419727b4d37..4a32cb0556c 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -321,8 +321,8 @@ rec_init_offsets_comp_ordinary( ordinary: lens = --nulls - n_core_null_bytes; - ut_d(n_null = std::min(n_core_null_bytes * 8U, - index->n_nullable)); + ut_d(n_null = std::min<uint>(n_core_null_bytes * 8U, + index->n_nullable)); break; case REC_LEAF_INSTANT: nulls -= REC_N_NEW_EXTRA_BYTES; |