diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 12:28:21 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-03-22 12:28:21 +0400 |
| commit | 475384c9d561b78b746fd345e2b294c80fdfa6e5 (patch) | |
| tree | 2475f4ff2573fe780ce391f1115b10424ff9f054 /mysql-test | |
| parent | f4a8badeed8e9a90ba6aec7a888f017035bebf72 (diff) | |
| parent | 23354862f03692361ffad39b86faef07df9fd74c (diff) | |
| download | mariadb-git-475384c9d561b78b746fd345e2b294c80fdfa6e5.tar.gz | |
Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
mysql-test/r/type_datetime.result:
Auto merged
mysql-test/t/type_datetime.test:
Auto merged
sql/item_timefunc.h:
merging
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/type_datetime.result | 3 | ||||
| -rw-r--r-- | mysql-test/t/type_datetime.test | 6 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index a8d5388097d..b54bd155c7d 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -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"); diff --git a/mysql-test/t/type_datetime.test b/mysql-test/t/type_datetime.test index 3aa162b4700..9246080630e 100644 --- a/mysql-test/t/type_datetime.test +++ b/mysql-test/t/type_datetime.test @@ -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 # |