diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
| commit | 6fb17a06016506498f4de75ff754f500f9f674f1 (patch) | |
| tree | d03c86959f150edc0f6f27ca2c06ccbc0e6e5bf0 /sql/sql_cache.cc | |
| parent | 2023fac28130d7d3f7d6776332239c62c3890195 (diff) | |
| parent | a4ab2431a20f6e2198d980f8e84fa7118515ca3b (diff) | |
| download | mariadb-git-6fb17a06016506498f4de75ff754f500f9f674f1.tar.gz | |
5.5.39 merge
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index cf68ba36997..6001517b0c7 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1711,7 +1711,7 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) 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 save on mutex locking in the case when query cache is disabled. @@ -1731,8 +1731,6 @@ Query_cache::send_result_to_client(THD *thd, char *org_sql, uint query_length) goto err; } - DBUG_ASSERT(query_cache_size != 0); // otherwise cache would be disabled - thd->query_cache_is_applicable= 1; sql= org_sql; sql_end= sql + query_length; |