diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2015-08-11 18:45:38 +0200 |
---|---|---|
committer | Sergei Golubchik <serg@mariadb.org> | 2015-09-04 10:33:56 +0200 |
commit | e3982cead235e9becb1abdbf0e73876c8a6e6b28 (patch) | |
tree | e02c8ac4c2a978aa12f1f9fdf19ec5303f7e9341 /mysql-test/r/grant_cache_ps_prot.result | |
parent | 21daa7b9298d31ab1c6ddd1159dba29acea8d868 (diff) | |
download | mariadb-git-e3982cead235e9becb1abdbf0e73876c8a6e6b28.tar.gz |
MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be stopped with no-zero size)
Diffstat (limited to 'mysql-test/r/grant_cache_ps_prot.result')
-rw-r--r-- | mysql-test/r/grant_cache_ps_prot.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/grant_cache_ps_prot.result b/mysql-test/r/grant_cache_ps_prot.result index b504dc4be35..5fe57c7c35d 100644 --- a/mysql-test/r/grant_cache_ps_prot.result +++ b/mysql-test/r/grant_cache_ps_prot.result @@ -1,5 +1,9 @@ +set GLOBAL sql_mode=""; +set LOCAL sql_mode=""; drop table if exists test.t1,mysqltest.t1,mysqltest.t2; drop database if exists mysqltest; +set GLOBAL query_cache_type=ON; +set LOCAL query_cache_type=ON; set GLOBAL query_cache_size=1355776; reset query cache; flush status; @@ -219,3 +223,7 @@ flush privileges; drop table test.t1,mysqltest.t1,mysqltest.t2; drop database mysqltest; set GLOBAL query_cache_size=default; +set GLOBAL query_cache_type=ON; +set LOCAL query_cache_type=ON; +set GLOBAL sql_mode=default; +set GLOBAL query_cache_type=default; |