summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-05-24 14:33:04 +0200
committerSergei Golubchik <sergii@pisem.net>2013-05-24 14:33:04 +0200
commit9bc4c4183df327140b5f477993f10f08282d977f (patch)
treeb5ce8333f4cca17e7681b18ff1e7648971f6ed4a /plugin
parentcb246b20d6e0dad16797b9e09bef6f0431b88d37 (diff)
downloadmariadb-git-9bc4c4183df327140b5f477993f10f08282d977f.tar.gz
MDEV-4516 SELECT from I_S.QUERY_CACHE_INFO produces ER_UNKNOWN_ERROR when query cache size is 0
if qc->try_lock() fails, it's not an error
Diffstat (limited to 'plugin')
-rw-r--r--plugin/qc_info/qc_info.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugin/qc_info/qc_info.cc b/plugin/qc_info/qc_info.cc
index af13b6edf93..8489b14c5db 100644
--- a/plugin/qc_info/qc_info.cc
+++ b/plugin/qc_info/qc_info.cc
@@ -83,7 +83,7 @@ static int qc_info_fill_table(THD *thd, TABLE_LIST *tables,
return 0;
if (qc->try_lock(thd))
- return status;
+ return 0; // QC is or is being disabled
/* loop through all queries in the query cache */
for (uint i= 0; i < queries->records; i++)