merging fixes

mysql-test/r/insert_update.result

@@ -378,7 +378,7 @@ id	c1	cnt
 INSERT IGNORE INTO t1 (id,c1) SELECT 1,NULL
 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
+Warning	1048	Column 'c1' cannot be null
 Error	1048	Column 'c1' cannot be null
 SELECT * FROM t1;
 id	c1	cnt
@@ -386,7 +386,7 @@ id	c1	cnt
 INSERT IGNORE INTO t1 (id,c1) SELECT * FROM t2
 ON DUPLICATE KEY UPDATE c1=NULL, cnt=cnt+1;
 Warnings:
-Warning	1263	Column was set to data type implicit default; NULL supplied for NOT NULL column 'c1' at row 1
+Warning	1048	Column 'c1' cannot be null
 Error	1048	Column 'c1' cannot be null
 SELECT * FROM t1;
 id	c1	cnt

mysql-test/r/type_newdecimal.result

@@ -1444,12 +1444,12 @@ select cast(11.1234 as DECIMAL(3,2));
 cast(11.1234 as DECIMAL(3,2))
 9.99
 Warnings:
-Error	1264	Out of range value adjusted for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
 select * from (select cast(11.1234 as DECIMAL(3,2))) t;
 cast(11.1234 as DECIMAL(3,2))
 9.99
 Warnings:
-Error	1264	Out of range value adjusted for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(11.1234 as DECIMAL(3,2))' at row 1
 select cast(a as DECIMAL(3,2))
 from (select 11.1233 as a
 UNION select 11.1234
@@ -1460,9 +1460,9 @@ cast(a as DECIMAL(3,2))
 9.99
 9.99
 Warnings:
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 select cast(a as DECIMAL(3,2)), count(*)
 from (select 11.1233 as a
 UNION select 11.1234
@@ -1471,10 +1471,10 @@ UNION select 12.1234
 cast(a as DECIMAL(3,2))	count(*)
 9.99	3
 Warnings:
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
-Error	1264	Out of range value adjusted for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
+Error	1264	Out of range value for column 'cast(a as DECIMAL(3,2))' at row 1
 End of 5.0 tests
 select cast(143.481 as decimal(4,1));
 cast(143.481 as decimal(4,1))