1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-10814: Don't coredump query cache

Browse Source 
merge fix: additional_data_size is a size_t class Query_cache member.
This commit is contained in:
Daniel Black 2018-02-26 18:13:59 +11:00
parent 0805a9565f
commit 31aa277768
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_cache.cc
View File

@ -2594,7 +2594,7 @@ size_t Query_cache::init_cache()
{ {
size_t mem_bin_count, num, step; size_t mem_bin_count, num, step;
size_t mem_bin_size, prev_size, inc; 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; int align;
DBUG_ENTER("Query_cache::init_cache"); DBUG_ENTER("Query_cache::init_cache");

2
sql/sql_cache.h
View File

@ -337,7 +337,7 @@ protected:
till the end of a flush operation. till the end of a flush operation.
*/ */
mysql_mutex_t structure_guard_mutex; mysql_mutex_t structure_guard_mutex;
ulong additional_data_size; size_t additional_data_size;
uchar *cache; // cache memory uchar *cache; // cache memory
Query_cache_block *first_block; // physical location block list Query_cache_block *first_block; // physical location block list
Query_cache_block *queries_blocks; // query list (LIFO) Query_cache_block *queries_blocks; // query list (LIFO)