diff options
| author | unknown <jimw@mysql.com> | 2005-05-18 13:54:36 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-18 13:54:36 -0700 |
| commit | 2de8a4bc8c821d096550ba5388c6b2dfccb4263e (patch) | |
| tree | da99bea4ccdeb25dbb92040037cff2c59bb9aacb /mysql-test/t/grant_cache.test | |
| parent | f8a20dbeb6d53fc5d993e088c245e4f2f9b085c5 (diff) | |
| parent | 9e8cad1d5a87c681b48266c96f2e1ea98052b40a (diff) | |
| download | mariadb-git-2de8a4bc8c821d096550ba5388c6b2dfccb4263e.tar.gz | |
Resolve merge from 4.1
mysql-test/r/grant_cache.result:
Auto merged
mysql-test/r/merge.result:
Auto merged
mysql-test/t/grant_cache.test:
Auto merged
mysql-test/t/merge.test:
Auto merged
sql/ha_myisammrg.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/handler.h:
Resolve merge
sql/table.cc:
Resolve merge
Diffstat (limited to 'mysql-test/t/grant_cache.test')
| -rw-r--r-- | mysql-test/t/grant_cache.test | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/t/grant_cache.test b/mysql-test/t/grant_cache.test index 1e24d5c9c03..f4423a68717 100644 --- a/mysql-test/t/grant_cache.test +++ b/mysql-test/t/grant_cache.test @@ -10,6 +10,8 @@ drop table if exists test.t1,mysqltest.t1,mysqltest.t2; drop database if exists mysqltest; --enable_warnings +set GLOBAL query_cache_size=1355776; + reset query cache; flush status; connect (root,localhost,root,,test,$MASTER_MYPORT,$MASTER_MYSOCK); @@ -145,3 +147,5 @@ 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; |