diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-04-25 17:22:25 +0200 |
| commit | 0accbd0364e0333e0b119aa9ce93e34ded9df6cb (patch) | |
| tree | bdf0738c29dc1f57fbfba3a1754524e238f15b52 /mysql-test/t/query_cache.test | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'mysql-test/t/query_cache.test')
| -rw-r--r-- | mysql-test/t/query_cache.test | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index d9293554615..56ea4e7c268 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -877,19 +877,6 @@ drop procedure f4; drop table t1; set GLOBAL query_cache_size=0; -# Tests moved from main.variables due to needing query cache in server. -set GLOBAL query_cache_size=100000; ---error ER_GLOBAL_VARIABLE -set SESSION query_cache_size=10000; -set global query_cache_limit=100; -set global query_cache_size=100; -set global query_cache_type=demand; - -set GLOBAL query_cache_type=default; -set GLOBAL query_cache_limit=default; -set GLOBAL query_cache_size=default; - - --echo End of 4.1 tests # |