database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Sergei Golubchik
2019-09-06 11:53:10 +02:00
parent 18af13b88b 2842c36985
commit 244f0e6dd8
750 changed files with 13360 additions and 14832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/main/query_cache.test
View File

@ -1,6 +1,7 @@
-- source include/have_query_cache.inc
-- source include/long_test.inc
set @save_query_cache_size=@@query_cache_size;
#
# Tests with query cache
#
@ -1236,7 +1237,7 @@ set session query_cache_type=on;
drop database db1;
show status like 'Qcache_queries_in_cache';
drop database db2;
set global query_cache_size=default;
set global query_cache_size=@save_query_cache_size;
--disable_warnings
drop database if exists db1;
@ -1266,7 +1267,7 @@ set session query_cache_type=on;
set GLOBAL query_cache_type=default;
set GLOBAL query_cache_limit=default;
set GLOBAL query_cache_min_res_unit=default;
set GLOBAL query_cache_size=default;
set GLOBAL query_cache_size=@save_query_cache_size;
set local query_cache_type=default;
set GLOBAL query_cache_type=on;
set local query_cache_type=on;
@ -1631,6 +1632,7 @@ select @@query_cache_size, @@global.query_cache_type, @@local.query_cache_type;
--echo # USER_STATISTICS (and in HOST_STATISTICS)
--echo #
set @save_userstat=@@global.userstat;
SET GLOBAL userstat=1;
set GLOBAL query_cache_size=1355776;
FLUSH USER_STATISTICS;
@ -1715,7 +1717,7 @@ show status like "Qcache_hits";
drop procedure p1;
drop table t1;
set GLOBAL query_cache_size=1355776;
SET GLOBAL userstat=default;
SET GLOBAL userstat=@save_userstat;
--echo End of 5.5 tests
@ -1783,5 +1785,4 @@ drop table t1;
--echo restore defaults
SET GLOBAL query_cache_type= default;
SET GLOBAL query_cache_size= default;
SET LOCAL query_cache_type= default;
SET GLOBAL query_cache_size=@save_query_cache_size;