Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into mysql.com:/home/gluh/MySQL/Merge/5.1-opt

Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
d6397390 · gluh@eagle.(none) · 1d42094d · 53b1c3a2 · d6397390
Commit d6397390 authored Oct 23, 2007 by gluh@eagle.(none)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/r/type_datetime.result mysql-test/r/type_datetime.result +1 -1

No files found.
--- 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 (), (), ();