diff options
| author | unknown <istruewing@stella.local> | 2008-03-14 14:15:36 +0100 |
|---|---|---|
| committer | unknown <istruewing@stella.local> | 2008-03-14 14:15:36 +0100 |
| commit | 8001dd1b86f89080ebb79f174e871a8320086d8a (patch) | |
| tree | 7a02fe42bda740b80be77fc37737660eb5413cce /mysql-test/r/query_cache.result | |
| parent | 9fa2d50559383785c72656dcdffa878cc3563da9 (diff) | |
| parent | ce86b14625d2beb4bc57da04da7359b9a85f4868 (diff) | |
| download | mariadb-git-8001dd1b86f89080ebb79f174e871a8320086d8a.tar.gz | |
Merge stella.local:/home2/mydev/mysql-5.0-axmrg
into stella.local:/home2/mydev/mysql-5.1-axmrg
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
BitKeeper/deleted/.del-rpl_transaction.test:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysql-test/r/query_cache.result:
Manual merge
mysql-test/t/query_cache.test:
Manual merge
Diffstat (limited to 'mysql-test/r/query_cache.result')
| -rw-r--r-- | mysql-test/r/query_cache.result | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 1a728354c7b..c516ad474ed 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -1654,6 +1654,32 @@ set GLOBAL query_cache_type=default; set GLOBAL query_cache_limit=default; set GLOBAL query_cache_min_res_unit=default; set GLOBAL query_cache_size=default; +FLUSH STATUS; +SET GLOBAL query_cache_size=10*1024*1024; +SET @save_concurrent_insert= @@concurrent_insert; +SET GLOBAL concurrent_insert= 0; +CREATE TABLE t1 (c1 INT NOT NULL) ENGINE=MyISAM; +INSERT INTO t1 (c1) VALUES (1), (2); +SHOW GLOBAL VARIABLES LIKE 'concurrent_insert'; +Variable_name Value +concurrent_insert 0 +SHOW STATUS LIKE 'Qcache_hits'; +Variable_name Value +Qcache_hits 0 +SELECT * FROM t1; +c1 +1 +2 +SELECT * FROM t1; +c1 +1 +2 +SHOW STATUS LIKE 'Qcache_hits'; +Variable_name Value +Qcache_hits 1 +DROP TABLE t1; +SET GLOBAL concurrent_insert= @save_concurrent_insert; +SET GLOBAL query_cache_size= default; End of 5.0 tests CREATE TABLE t1 (a ENUM('rainbow')); INSERT INTO t1 VALUES (),(),(),(),(); |