diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-03-23 00:18:20 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-03-23 00:18:20 +0200 |
| commit | 4dd4b1e8f2b464c0b7b09928abfc4b2e572f31af (patch) | |
| tree | c330643b4dcc0c529481dd4f7c0f503a4651450b /mysql-test | |
| parent | 7505d6945fd79a12d5866a6751fa297bc016a49f (diff) | |
| parent | 3d2ac023a0356f72c64487715364232a3bd11abd (diff) | |
| download | mariadb-git-4dd4b1e8f2b464c0b7b09928abfc4b2e572f31af.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.0
into sanja.is.com.ua:/home/bell/mysql/work-qc-4.0
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/have_query_cache.inc | 4 | ||||
| -rw-r--r-- | mysql-test/r/flush.result | 5 | ||||
| -rw-r--r-- | mysql-test/r/have_query_cache.require | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush.test | 8 | ||||
| -rw-r--r-- | mysql-test/t/grant_cache.test | 2 | ||||
| -rw-r--r-- | mysql-test/t/query_cache.test | 2 |
6 files changed, 10 insertions, 13 deletions
diff --git a/mysql-test/include/have_query_cache.inc b/mysql-test/include/have_query_cache.inc new file mode 100644 index 00000000000..e5e6052c9a7 --- /dev/null +++ b/mysql-test/include/have_query_cache.inc @@ -0,0 +1,4 @@ +-- require r/have_query_cache.require +disable_query_log; +show variables like "have_query_cache"; +enable_query_log; diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result index a7f73a6840b..7080f2b6145 100644 --- a/mysql-test/r/flush.result +++ b/mysql-test/r/flush.result @@ -28,8 +28,3 @@ select * from t1; n 345 drop table t1; -flush query cache; -reset query cache; -show status like "Qcache_queries_in_cache"; -Variable_name Value -Qcache_queries_in_cache 0 diff --git a/mysql-test/r/have_query_cache.require b/mysql-test/r/have_query_cache.require new file mode 100644 index 00000000000..312d837fed3 --- /dev/null +++ b/mysql-test/r/have_query_cache.require @@ -0,0 +1,2 @@ +Variable_name Value +have_query_cache YES diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test index 38aa37caa4f..540aa4235cc 100644 --- a/mysql-test/t/flush.test +++ b/mysql-test/t/flush.test @@ -67,11 +67,3 @@ insert into t1 values (345); select * from t1; drop table t1; -# -# Test that QUERY CACHE commands doesn't core dump. -# (Normally we don't have a cache active at this point) -# - -flush query cache; -reset query cache; -show status like "Qcache_queries_in_cache"; diff --git a/mysql-test/t/grant_cache.test b/mysql-test/t/grant_cache.test index a6c878cc31c..09ce1021fbf 100644 --- a/mysql-test/t/grant_cache.test +++ b/mysql-test/t/grant_cache.test @@ -1,3 +1,5 @@ +-- source include/have_query_cache.inc + # # Test grants with query cache # diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index b4d00639587..a3227a5db1d 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -1,3 +1,5 @@ +-- source include/have_query_cache.inc + # # Tests with query cache # |