diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-10 11:19:25 +0300 |
| commit | c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa (patch) | |
| tree | 1f860a1e1cb620fa9a71c99967bb19d64a8c2a3c /sql/sql_cache.cc | |
| parent | 62dce14d156ff99836a23f5ccadcfaa19cf11f8a (diff) | |
| parent | cf71cc838e608b4a4b8ae2557d4957ecb9bef97a (diff) | |
| download | mariadb-git-c11e5cdd12a6ffbc3c95e0abff6cc86920d592fa.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 54f7db3e684..5b649b739c6 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -329,9 +329,6 @@ TODO list: */ #include "mariadb.h" /* NO_EMBEDDED_ACCESS_CHECKS */ -#if defined(DBUG_OFF) && defined(HAVE_MADVISE) -#include <sys/mman.h> -#endif #include "sql_priv.h" #include "sql_basic_types.h" #include "sql_cache.h" @@ -2661,7 +2658,7 @@ size_t Query_cache::init_cache() #if defined(DBUG_OFF) && defined(HAVE_MADVISE) && defined(MADV_DONTDUMP) if (madvise(cache, query_cache_size+additional_data_size, MADV_DONTDUMP)) { - DBUG_PRINT("warning", ("coudn't mark query cache memory as MADV_DONTDUMP: %s", + DBUG_PRINT("warning", ("coudn't mark query cache memory as " DONTDUMP_STR ": %s", strerror(errno))); } #endif @@ -2830,7 +2827,7 @@ void Query_cache::free_cache() #if defined(DBUG_OFF) && defined(HAVE_MADVISE) && defined(MADV_DODUMP) if (madvise(cache, query_cache_size+additional_data_size, MADV_DODUMP)) { - DBUG_PRINT("warning", ("coudn't mark query cache memory as MADV_DODUMP: %s", + DBUG_PRINT("warning", ("coudn't mark query cache memory as " DODUMP_STR ": %s", strerror(errno))); } #endif |