diff options
| author | unknown <serg@serg.mysql.com> | 2002-01-13 12:56:34 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-01-13 12:56:34 +0000 |
| commit | a1cfdf43408d27fc809cf6ea9cf768eb37ff01da (patch) | |
| tree | e6b82038c6276616ceb08d2f9a49a301caa4bbe0 /mysql-test | |
| parent | f4da62e138bc92d3b200a9537670739e7d2c0bbd (diff) | |
| parent | 1c603ad1ef7b648fbe55ec3fdbad5d8d4cb14cba (diff) | |
| download | mariadb-git-a1cfdf43408d27fc809cf6ea9cf768eb37ff01da.tar.gz | |
Merge
Docs/manual.texi:
SCCS merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/query_cache.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/query_cache.test | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/query_cache.result b/mysql-test/r/query_cache.result index 632f64e25de..af14575a812 100644 --- a/mysql-test/r/query_cache.result +++ b/mysql-test/r/query_cache.result @@ -179,8 +179,6 @@ create table t2 (a text not null); create table t21 (a text not null); create table t3 (a text not null); insert into t1 values("1111111111111111111111111111111111111111111111111111"); -insert into t11 select * from t1; -insert into t21 select * from t1; insert into t2 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; @@ -196,6 +194,8 @@ insert into t1 select * from t2; insert into t2 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; +insert into t11 select * from t1; +insert into t21 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; insert into t1 select * from t2; diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 280f2202af1..b4d00639587 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -93,8 +93,6 @@ create table t2 (a text not null); create table t21 (a text not null); create table t3 (a text not null); insert into t1 values("1111111111111111111111111111111111111111111111111111"); -insert into t11 select * from t1; -insert into t21 select * from t1; insert into t2 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; @@ -110,6 +108,9 @@ insert into t1 select * from t2; insert into t2 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; +# t11 and t21 must be over 4Kb (QUERY_CACHE_MIN_RESULT_DATA_SIZE) +insert into t11 select * from t1; +insert into t21 select * from t1; insert into t1 select * from t2; insert into t2 select * from t1; insert into t1 select * from t2; |