1 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index 08612fa191f..d6dfb4621ab 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/r/null.result
@@ -76,27 +76,43 @@ drop table t1;
 CREATE TABLE t1 (a varchar(16) NOT NULL, b smallint(6) NOT NULL, c datetime NOT NULL, d smallint(6) NOT NULL);
 INSERT INTO t1 SET a = "", d= "2003-01-14 03:54:55";
 UPDATE t1 SET d=1/NULL;
+Warnings:
+Warning	1263	Data truncated for column 'd' at row 1
 UPDATE t1 SET d=NULL;
+Warnings:
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'd' at row 1
 INSERT INTO t1 (a) values (null);
 Column 'a' cannot be null
 INSERT INTO t1 (a) values (1/null);
 Column 'a' cannot be null
 INSERT INTO t1 (a) values (null),(null);
+Warnings:
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'a' at row 1
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'a' at row 2
 INSERT INTO t1 (b) values (null);
 Column 'b' cannot be null
 INSERT INTO t1 (b) values (1/null);
 Column 'b' cannot be null
 INSERT INTO t1 (b) values (null),(null);
+Warnings:
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'b' at row 1
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'b' at row 2
 INSERT INTO t1 (c) values (null);
 Column 'c' cannot be null
 INSERT INTO t1 (c) values (1/null);
 Column 'c' cannot be null
 INSERT INTO t1 (c) values (null),(null);
+Warnings:
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'c' at row 1
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'c' at row 2
 INSERT INTO t1 (d) values (null);
 Column 'd' cannot be null
 INSERT INTO t1 (d) values (1/null);
 Column 'd' cannot be null
 INSERT INTO t1 (d) values (null),(null);
+Warnings:
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'd' at row 1
+Warning	1261	Data truncated, NULL supplied to NOT NULL column 'd' at row 2
 select * from t1;
 a	b	c	d
 	0	0000-00-00 00:00:00	0