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-5924 MariaDB could crash after changing the query_cache size with SET GLOBAL

Browse Source 
* remove incorrect assertion (it didn't take into account concurrent clients)
* fix the comment
This commit is contained in:
Sergei Golubchik
2014-07-29 12:05:58 +02:00
parent 6ef139780d
commit c1c6f6f161
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_cache.cc
View File

@ -1669,7 +1669,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
DBUG_ENTER("Query_cache::send_result_to_client"); DBUG_ENTER("Query_cache::send_result_to_client");
/* /*
Testing 'query_cache_size' without a lock here is safe: the thing Testing without a lock here is safe: the thing
we may loose is that the query won't be served from cache, but we we may loose is that the query won't be served from cache, but we
save on mutex locking in the case when query cache is disabled. save on mutex locking in the case when query cache is disabled.
@ -1689,8 +1689,6 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length)
goto err; goto err;
} }
DBUG_ASSERT(query_cache_size != 0); // otherwise cache would be disabled
thd->query_cache_is_applicable= 1; thd->query_cache_is_applicable= 1;
sql= org_sql; sql_end= sql + query_length; sql= org_sql; sql_end= sql + query_length;