diff options
author | unknown <jimw@mysql.com> | 2005-08-04 12:49:23 -0700 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-08-04 12:49:23 -0700 |
commit | 1f0c2ab3fc2431baf2cbbcf2d42a206226a07730 (patch) | |
tree | fc0ab4c64f0db1183511695134392ee58765eda9 /mysql-test/t/query_cache.test | |
parent | 2b41471429d9db41d64bfb214e29ba57cb3db381 (diff) | |
parent | 1beb95e3e43c7ae56a75e9206fa2b904480d0604 (diff) | |
download | mariadb-git-1f0c2ab3fc2431baf2cbbcf2d42a206226a07730.tar.gz |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
BitKeeper/deleted/.del-not_windows.inc:
Delete: mysql-test/include/not_windows.inc
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/query_cache.test:
Auto merged
mysql-test/t/rpl_flush_tables.test:
Auto merged
sql-common/my_time.c:
Auto merged
mysql-test/r/query_cache.result:
Resolve conflict
Diffstat (limited to 'mysql-test/t/query_cache.test')
-rw-r--r-- | mysql-test/t/query_cache.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/query_cache.test b/mysql-test/t/query_cache.test index 326fd775549..822c27fe40d 100644 --- a/mysql-test/t/query_cache.test +++ b/mysql-test/t/query_cache.test @@ -709,9 +709,9 @@ CREATE TABLE t1 ( INSERT INTO t1 VALUES ('20050326'); INSERT INTO t1 VALUES ('20050325'); -SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 0:0:0'; -SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 0:0:0'; -SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 0:0:0'; +SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid'; +SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid'; +SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid'; show status like "Qcache_queries_in_cache"; show status like "Qcache_inserts"; show status like "Qcache_hits"; |