diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-03-28 15:36:42 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-03-28 15:36:42 +0200 |
| commit | c15f1acd820a176a018d6eba5b2e303e1f1a3fe8 (patch) | |
| tree | 244e0ab70ebff0fe4c47bedbcc5aded8e747db80 /mysql-test/r/query_cache.result | |
| parent | f149c2776d48cfe53baff16b39157199a81bbfce (diff) | |
| parent | 5b2a810e5d857856971dcd0e9f88ec1a397486d2 (diff) | |
| download | mariadb-git-c15f1acd820a176a018d6eba5b2e303e1f1a3fe8.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-show-4.0
mysql-test/r/query_cache.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'mysql-test/r/query_cache.result')
| -rw-r--r-- | mysql-test/r/query_cache.result | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 0907abcbc86..936bbf30006 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -237,13 +237,18 @@ a show status like "Qcache_queries_in_cache"; Variable_name Value Qcache_queries_in_cache 0 -select sql_cache * from t1; +select sql_cache * from t1 union select * from t1; a 1 2 3 set query_cache_type=2; -select sql_cache * from t1; +select sql_cache * from t1 union select * from t1; +a +1 +2 +3 +select * from t1 union select sql_cache * from t1; a 1 2 @@ -253,7 +258,7 @@ Variable_name Value Qcache_hits 4 show status like "Qcache_queries_in_cache"; Variable_name Value -Qcache_queries_in_cache 1 +Qcache_queries_in_cache 2 set query_cache_type=on; reset query cache; show status like "Qcache_queries_in_cache"; |