summaryrefslogtreecommitdiff
path: root/mysql-test
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 /mysql-test
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 'mysql-test')
-rw-r--r--mysql-test/suite/plugins/r/qc_info.result3
-rw-r--r--mysql-test/suite/plugins/t/qc_info.test3
2 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/plugins/r/qc_info.result b/mysql-test/suite/plugins/r/qc_info.result
index 3e967d55f43..ab646d74511 100644
--- a/mysql-test/suite/plugins/r/qc_info.result
+++ b/mysql-test/suite/plugins/r/qc_info.result
@@ -12,4 +12,7 @@ test select * from t1 1 512
drop table t1;
select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
statement_schema statement_text result_blocks_count result_blocks_size
+set global query_cache_size = 0;
+select * from information_schema.query_cache_info;
+STATEMENT_SCHEMA STATEMENT_TEXT RESULT_BLOCKS_COUNT RESULT_BLOCKS_SIZE RESULT_BLOCKS_SIZE_USED
set global query_cache_size= default;
diff --git a/mysql-test/suite/plugins/t/qc_info.test b/mysql-test/suite/plugins/t/qc_info.test
index fc6c9d5af3a..a081617c524 100644
--- a/mysql-test/suite/plugins/t/qc_info.test
+++ b/mysql-test/suite/plugins/t/qc_info.test
@@ -4,5 +4,8 @@ drop table t1;
# the query was invalidated
select statement_schema, statement_text, result_blocks_count, result_blocks_size from information_schema.query_cache_info;
+set global query_cache_size = 0;
+select * from information_schema.query_cache_info;
+
set global query_cache_size= default;