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

9
sql/sql_cache.h
View File

@ -156,8 +156,9 @@ struct Query_cache_query
Query_cache_block *res;
Query_cache_tls *wri;
ulong len;
uint8 tbls_type;
unsigned int last_pkt_nr;
uint8 tbls_type;
uint8 ready;
Query_cache_query() {} /* Remove gcc warning */
inline void init_n_lock();
@ -177,6 +178,12 @@ struct Query_cache_query
{
return (((uchar*)this) + ALIGN_SIZE(sizeof(Query_cache_query)));
}
/**
following used to check if result ready in plugin without
locking rw_lock of the query.
*/
inline void set_results_ready() { ready= 1; }
inline bool is_results_ready() { return ready; }
void lock_writing();
void lock_reading();
bool try_lock_writing();