MDEV-10814: Don't coredump query cache

merge fix: additional_data_size is a size_t class Query_cache member.
MariaDB · Feb 26, 2018 · 31aa277 · 31aa277
1 parent 0805a95
commit 31aa277
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -337,7 +337,7 @@ class Query_cache
     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)