diff options
author | gluh@eagle.(none) <> | 2007-10-23 20:11:39 +0500 |
---|---|---|
committer | gluh@eagle.(none) <> | 2007-10-23 20:11:39 +0500 |
commit | d6397390229476a8084a30ef16b9dd8cee4ab19d (patch) | |
tree | ad25f9473357446e4cdb18594cdf6c84b20cad55 /mysql-test/r | |
parent | 1d42094d182da84df51759b3f78b25d9caaa269c (diff) | |
parent | 53b1c3a29941634fb77cb20a62cc0f1acfc8d05d (diff) | |
download | mariadb-git-d6397390229476a8084a30ef16b9dd8cee4ab19d.tar.gz |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
Diffstat (limited to 'mysql-test/r')
-rw-r--r-- | mysql-test/r/type_datetime.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/type_datetime.result b/mysql-test/r/type_datetime.result index c15deb8b1e5..e1443c3fa1b 100644 --- a/mysql-test/r/type_datetime.result +++ b/mysql-test/r/type_datetime.result @@ -497,7 +497,7 @@ select * from t1 where (convert(f1,datetime)) != 1; f1 15:44:44 Warnings: -Warning 1292 Incorrect datetime value: '0000-00-00 45:44:44' +Warning 1292 Truncated incorrect datetime value: '0000-00-00 45:44:44' drop table t1; create table t1 (a tinyint); insert into t1 values (), (), (); |