Commit c1c6f6f1 authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-5924 MariaDB could crash after changing the query_cache size with SET GLOBAL

* remove incorrect assertion (it didn't take into account concurrent clients)
* fix the comment
parent 6ef13978
...@@ -1669,7 +1669,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) ...@@ -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) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment