diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2015-09-06 21:01:59 +0300 |
|---|---|---|
| committer | Elena Stepanova <elenst@montyprogram.com> | 2015-09-06 21:01:59 +0300 |
| commit | 675ca12ae432d00fff81293059f7c82c22e93152 (patch) | |
| tree | 26ad2890e0f872786d41fb33ff18de01467e118d /mysql-test/suite/storage_engine | |
| parent | 1a36caf0e9f0abf8800335c46cf38a8486a744da (diff) | |
| download | mariadb-git-675ca12ae432d00fff81293059f7c82c22e93152.tar.gz | |
Follow-up for MDEV-6066 (new defaults from 5.6 and 5.7)
New defaults for query cache caused wrong test output
Diffstat (limited to 'mysql-test/suite/storage_engine')
| -rw-r--r-- | mysql-test/suite/storage_engine/select.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/storage_engine/select.test | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mysql-test/suite/storage_engine/select.result b/mysql-test/suite/storage_engine/select.result index 015ed80b771..9bd36cffc27 100644 --- 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 index 34cfd99d344..9b4e1784f47 100644 --- 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 |