database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Follow-up for MDEV-6066 (new defaults from 5.6 and 5.7)

Browse Source 
New defaults for query cache caused wrong test output
This commit is contained in:
Elena Stepanova
2015-09-06 21:01:59 +03:00
parent 1a36caf0e9
commit 675ca12ae4
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/storage_engine/select.result
View File

@@ -68,7 +68,8 @@ a
SELECT FOUND_ROWS();
FOUND_ROWS()
3
SET GLOBAL query_cache_size = 1024*1024;
SET GLOBAL query_cache_type = ON;
SET query_cache_type = ON;
SELECT SQL_CACHE * FROM t1, t2;
a b a b
1 z 1 z
@@ -89,7 +90,7 @@ a b a b
200 bar 100 foobar
200 bar 200 bar
200 bar 200 bar
SET GLOBAL query_cache_size = 0;
SET GLOBAL query_cache_type = DEFAULT;
SELECT a+10 AS field1, CONCAT(b,':',b) AS field2 FROM t1
WHERE b > 'b' AND a IS NOT NULL
GROUP BY 2 DESC, field1 ASC

6
mysql-test/suite/storage_engine/select.test
View File

@@ -45,11 +45,11 @@ SELECT SQL_BIG_RESULT SQL_CALC_FOUND_ROWS DISTINCT(t2.a)
FROM t1 t1_1, t2, t1 t1_2;
SELECT FOUND_ROWS();
let $query_cache = `SELECT @@query_cache_size`;
SET GLOBAL query_cache_size = 1024*1024;
SET GLOBAL query_cache_type = ON;
SET query_cache_type = ON;
--sorted_result
SELECT SQL_CACHE * FROM t1, t2;
eval SET GLOBAL query_cache_size = $query_cache;
SET GLOBAL query_cache_type = DEFAULT;
# Combination of main clauses