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/r/query_cache.result | |
| parent | 37f87d73ae8dc6c30594867b40a5d70159acf63c (diff) | |
| download | mariadb-git-0accbd0364e0333e0b119aa9ce93e34ded9df6cb.tar.gz | |
lots of post-merge changes
Diffstat (limited to 'mysql-test/r/query_cache.result')
| -rw-r--r-- | mysql-test/r/query_cache.result | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 4cf1e58e1ea..df167cf3bdb 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1265,15 +1265,6 @@ drop procedure f3; drop procedure f4; drop table t1; set GLOBAL query_cache_size=0; -set GLOBAL query_cache_size=100000; -set SESSION query_cache_size=10000; -ERROR HY000: Variable 'query_cache_size' is a GLOBAL variable and should be set with SET GLOBAL -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; End of 4.1 tests SET GLOBAL query_cache_size=102400; create table t1(a int); |