From 31aa27776868ddd656ddb5d39e3d0a1a82e2e218 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Mon, 26 Feb 2018 18:13:59 +1100 Subject: [PATCH] MDEV-10814: Don't coredump query cache merge fix: additional_data_size is a size_t class Query_cache member. --- sql/sql_cache.cc | 2 +- sql/sql_cache.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 1af9e2535d3..d46df21bfcf 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2594,7 +2594,7 @@ size_t Query_cache::init_cache() { size_t mem_bin_count, num, step; size_t mem_bin_size, prev_size, inc; - size_t additional_data_size, max_mem_bin_size, approx_additional_data_size; + size_t max_mem_bin_size, approx_additional_data_size; int align; DBUG_ENTER("Query_cache::init_cache"); diff --git a/sql/sql_cache.h b/sql/sql_cache.h index 98c5ded7f97..0ed45a9ed81 100644 --- a/sql/sql_cache.h +++ b/sql/sql_cache.h @@ -337,7 +337,7 @@ protected: till the end of a flush operation. */ mysql_mutex_t structure_guard_mutex; - ulong additional_data_size; + size_t additional_data_size; uchar *cache; // cache memory Query_cache_block *first_block; // physical location block list Query_cache_block *queries_blocks; // query list (LIFO)