Merge mysql.com:/home/hf/work/mrg/mysql-4.1-opt

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/t/type_datetime.test:
  Auto merged
mysql-test/r/type_datetime.result:
  SCCS merged
sql/item_timefunc.h:
  SCCS merged
This commit is contained in:
unknown 2007-03-22 12:26:32 +04:00
commit 23354862f0
3 changed files with 16 additions and 0 deletions

View file

@ -168,6 +168,9 @@ dt
0000-00-00 00:00:00
0000-00-00 00:00:00
drop table t1;
select cast('2006-12-05 22:10:10' as datetime) + 0;
cast('2006-12-05 22:10:10' as datetime) + 0
20061205221010.000000
CREATE TABLE t1(a DATETIME NOT NULL);
INSERT INTO t1 VALUES ('20060606155555');
SELECT a FROM t1 WHERE a=(SELECT MAX(a) FROM t1) AND (a="20060606155555");

View file

@ -113,6 +113,12 @@ insert into t1 values ("00-00-00"), ("00-00-00 00:00:00");
select * from t1;
drop table t1;
#
# Bug #16546 DATETIME+0 not always coerced the same way
#
select cast('2006-12-05 22:10:10' as datetime) + 0;
# End of 4.1 tests
#