bk commit into 4.1 tree (jimw:1.2359)

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2359 05/08/04 12:45:32 jimw@stripped +2 -0
  Update test to deal with more relaxed datetime parsing.

  mysql-test/t/query_cache.test
    1.46 05/08/04 12:45:29 jimw@stripped +3 -3
    Change test to use a truly invalid date, now that dates like 
    '20050327 0:0:0' are handled as they are in 4.0.

  mysql-test/r/query_cache.result
    1.59 05/08/04 12:45:28 jimw@stripped +9 -9
    Updated results

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-clean

--- 1.58/mysql-test/r/query_cache.result	2005-07-29 05:13:35 -07:00
+++ 1.59/mysql-test/r/query_cache.result	2005-08-04 12:45:28 -07:00
@@ -902,24 +902,24 @@
 ) ENGINE=MyISAM;
 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 '20050327 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '20050327 0:0:0'
-Warning	1292	Truncated incorrect datetime value: '20050327 0:0:0'
-SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 0:0:0';
+Warning	1292	Truncated incorrect datetime value: '20050327 invalid'
+Warning	1292	Truncated incorrect datetime value: '20050327 invalid'
+SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050328 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '20050328 0:0:0'
-Warning	1292	Truncated incorrect datetime value: '20050328 0:0:0'
-SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 0:0:0';
+Warning	1292	Truncated incorrect datetime value: '20050328 invalid'
+Warning	1292	Truncated incorrect datetime value: '20050328 invalid'
+SELECT COUNT(*) FROM t1 WHERE date BETWEEN '20050326' AND '20050327 invalid';
 COUNT(*)
 0
 Warnings:
-Warning	1292	Truncated incorrect datetime value: '20050327 0:0:0'
-Warning	1292	Truncated incorrect datetime value: '20050327 0:0:0'
+Warning	1292	Truncated incorrect datetime value: '20050327 invalid'
+Warning	1292	Truncated incorrect datetime value: '20050327 invalid'
 show status like "Qcache_queries_in_cache";
 Variable_name	Value
 Qcache_queries_in_cache	0

--- 1.45/mysql-test/t/query_cache.test	2005-07-29 05:13:35 -07:00
+++ 1.46/mysql-test/t/query_cache.test	2005-08-04 12:45:29 -07:00
@@ -679,9 +679,9 @@
 
 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";