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

New defaults for query cache caused wrong test output
MariaDB · Sep 6, 2015 · 675ca12 · 675ca12
1 parent 1a36caf
commit 675ca12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/mysql-test/suite/storage_engine/select.result b/mysql-test/suite/storage_engine/select.result
@@ -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

diff --git a/mysql-test/suite/storage_engine/select.test b/mysql-test/suite/storage_engine/select.test
@@ -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