database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-10777: Server crashed due to query_cache_info plugin

Browse Source 
Possible fix. Make the pluging more safe.
This commit is contained in:
Oleksandr Byelkin
2016-09-14 18:15:03 +02:00
parent 3f5aedccca
commit e226276950
3 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_cache.cc
View File

@ -961,7 +961,7 @@ inline void Query_cache_query::unlock_reading()
void Query_cache_query::init_n_lock()
{
DBUG_ENTER("Query_cache_query::init_n_lock");
res=0; wri = 0; len = 0;
res=0; wri = 0; len = 0; ready= 0;
mysql_rwlock_init(key_rwlock_query_cache_query_lock, &lock);
lock_writing();
DBUG_PRINT("qcache", ("inited & locked query for block 0x%lx",
@ -1226,6 +1226,7 @@ void Query_cache::end_of_result(THD *thd)
query_cache.split_block(last_result_block,len);
header->found_rows(limit_found_rows);
header->set_results_ready(); // signal for plugin
header->result()->type= Query_cache_block::RESULT;
/* Drop the writer. */