diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2019-09-23 18:28:55 +1000 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-10-02 20:00:05 +0400 |
| commit | 716c748f97d8f7cb7caaf39dd7b9cdaf79b2229a (patch) | |
| tree | c6e5ea5d6bf7832d37ac73738cc513562a575011 /storage | |
| parent | 7e44c455f4de82081af5089e1f77378676aa45ff (diff) | |
| download | mariadb-git-716c748f97d8f7cb7caaf39dd7b9cdaf79b2229a.tar.gz | |
MDEV-20684: innodb/query cache use madvise CORE/NOCORE on FreeBSD
This applies to large allocations.
This maps to the way Linux does it in MDEV-10814 except FreeBSD uses
different constants.
Adjust error string to match to implementation.
Tested on FreeBSD-12.0
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/ut0new.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/ut0new.h b/storage/innobase/include/ut0new.h index 6732a12ecf1..46867a60023 100644 --- a/storage/innobase/include/ut0new.h +++ b/storage/innobase/include/ut0new.h @@ -252,7 +252,7 @@ static inline void ut_allocate_trace_dontdump(void *ptr, size_t bytes, #if defined(DBUG_OFF) && defined(HAVE_MADVISE) && defined(MADV_DONTDUMP) if (dontdump && madvise(ptr, bytes, MADV_DONTDUMP)) { - ib::warn() << "Failed to set memory to DONTDUMP: " + ib::warn() << "Failed to set memory to " DONTDUMP_STR ": " << strerror(errno) << " ptr " << ptr << " size " << bytes; @@ -270,7 +270,7 @@ static inline void ut_allocate_trace_dontdump(void *ptr, size_t bytes, static inline void ut_dodump(void* ptr, size_t m_size) { if (ptr && madvise(ptr, m_size, MADV_DODUMP)) { - ib::warn() << "Failed to set memory to DODUMP: " + ib::warn() << "Failed to set memory to " DODUMP_STR ": " << strerror(errno) << " ptr " << ptr << " size " << m_size; |