summaryrefslogtreecommitdiff
path: root/mysql-test/r/grant_cache.result
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-05-18 13:54:36 -0700
committerjimw@mysql.com <>2005-05-18 13:54:36 -0700
commitb7079ed0277e1c788a72f47f3b430e15c043c6a7 (patch)
treeda99bea4ccdeb25dbb92040037cff2c59bb9aacb /mysql-test/r/grant_cache.result
parent3f6aad900c34707b58c6fffb7f90d044f6c351ac (diff)
parent816e84c1f618e6f20eea9857e77328949cf8f8d9 (diff)
downloadmariadb-git-b7079ed0277e1c788a72f47f3b430e15c043c6a7.tar.gz
Resolve merge from 4.1
Diffstat (limited to 'mysql-test/r/grant_cache.result')
-rw-r--r--mysql-test/r/grant_cache.result2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/grant_cache.result b/mysql-test/r/grant_cache.result
index 2a1170ee751..925a5918c1b 100644
--- a/mysql-test/r/grant_cache.result
+++ b/mysql-test/r/grant_cache.result
@@ -1,5 +1,6 @@
drop table if exists test.t1,mysqltest.t1,mysqltest.t2;
drop database if exists mysqltest;
+set GLOBAL query_cache_size=1355776;
reset query cache;
flush status;
show grants for current_user;
@@ -206,3 +207,4 @@ delete from mysql.columns_priv where user in ("mysqltest_1","mysqltest_2","mysql
flush privileges;
drop table test.t1,mysqltest.t1,mysqltest.t2;
drop database mysqltest;
+set GLOBAL query_cache_size=default;