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

MDEV-4520: Assertion `0' fails in Query_cache::end_of_result on concurrent drop event and event executio

Browse Source 
Fix for embedded library, where thd->net.vio is not set which efficently switched off QC in emmbedded server for previous patch.
This commit is contained in:
unknown 2013-05-30 08:23:49 +03:00
parent 1db0c42e53
commit 22b60fa95c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_cache.cc
View File

@ -3985,6 +3985,18 @@ Query_cache::process_and_count_tables(THD *thd, TABLE_LIST *tables_used,
} }
/*
In non-embedded QC intercepts result in net_real_write
but if we have no net.vio then net_real_write
will not be called, so QC can't get results of the query
*/
#ifdef EMBEDDED_LIBRARY
#define qc_is_able_to_intercept_result(T) 1
#else
#define qc_is_able_to_intercept_result(T) ((T)->net.vio)
#endif
/* /*
If query is cacheable return number tables in query If query is cacheable return number tables in query
(query without tables are not cached) (query without tables are not cached)
@ -4001,7 +4013,7 @@ Query_cache::is_cacheable(THD *thd, LEX *lex,
(thd->variables.query_cache_type == 1 || (thd->variables.query_cache_type == 1 ||
(thd->variables.query_cache_type == 2 && (lex->select_lex.options & (thd->variables.query_cache_type == 2 && (lex->select_lex.options &
OPTION_TO_QUERY_CACHE))) && OPTION_TO_QUERY_CACHE))) &&
thd->net.vio) qc_is_able_to_intercept_result(thd))
{ {
DBUG_PRINT("qcache", ("options: %lx %lx type: %u", DBUG_PRINT("qcache", ("options: %lx %lx type: %u",
(long) OPTION_TO_QUERY_CACHE, (long) OPTION_TO_QUERY_CACHE,
@ -4028,7 +4040,7 @@ Query_cache::is_cacheable(THD *thd, LEX *lex,
(long) OPTION_TO_QUERY_CACHE, (long) OPTION_TO_QUERY_CACHE,
(long) lex->select_lex.options, (long) lex->select_lex.options,
(int) thd->variables.query_cache_type, (int) thd->variables.query_cache_type,
(uint) test(thd->net.vio))); (uint) test(qc_is_able_to_intercept_result(thd))));
DBUG_RETURN(0); DBUG_RETURN(0);
} }