Automatic merge with 5.5

11 files changed, 188 insertions, 186 deletions

diff --git a/mysql-test/suite/engines/iuds/r/delete_time.result b/mysql-test/suite/engines/iuds/r/delete_time.result
index 619b31bf4ce..00b2262e07b 100644
--- a/mysql-test/suite/engines/iuds/r/delete_time.result
+++ b/mysql-test/suite/engines/iuds/r/delete_time.result
@@ -497,10 +497,10 @@ c2
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
+11:11:11
 11:11:27
 125:00:00
 125:05:00
@@ -644,7 +644,7 @@ c1	c2
 -838:59:59	-838:59:59
 00:04:00	00:04:00
 00:54:54	00:54:54
-11:11:11	11:11:11
+02:02:02	02:02:02
 12:34:56	NULL
 SELECT * FROM t2;
 c1	c2
diff --git a/mysql-test/suite/engines/iuds/r/delete_year.result b/mysql-test/suite/engines/iuds/r/delete_year.result
index 02cbe24ecc9..c82f0dae7d9 100644
--- a/mysql-test/suite/engines/iuds/r/delete_year.result
+++ b/mysql-test/suite/engines/iuds/r/delete_year.result
@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
diff --git a/mysql-test/suite/engines/iuds/r/insert_decimal.result b/mysql-test/suite/engines/iuds/r/insert_decimal.result
index 6aa7f5aab01..50fde80d81d 100644
--- a/mysql-test/suite/engines/iuds/r/insert_decimal.result
+++ b/mysql-test/suite/engines/iuds/r/insert_decimal.result
@@ -1013,7 +1013,7 @@ ROUND(c1,c2)	TRUNCATE(c1,c2)
 1.133000	1.132000
 DROP TABLE t5;
 CREATE TABLE t7(c1 DECIMAL(66,0));
-ERROR 42000: Too big precision 66 specified for column 'c1'. Maximum is 65.
+ERROR 42000: Too big precision 66 specified for 'c1'. Maximum is 65.
 CREATE TABLE t7(c1 DECIMAL(5,10));
 ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'c1').
 DROP TABLE t1,t2;
diff --git a/mysql-test/suite/engines/iuds/r/insert_number.result b/mysql-test/suite/engines/iuds/r/insert_number.result
index fed2e0f683b..ce6a2af6d5f 100644
--- a/mysql-test/suite/engines/iuds/r/insert_number.result
+++ b/mysql-test/suite/engines/iuds/r/insert_number.result
@@ -5316,12 +5316,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-128	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 128 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 128 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-128	1	2	3	4	5
@@ -11010,12 +11018,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-32768	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 32768 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 32768 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-32768	1	2	3	4	5
@@ -16809,12 +16825,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-8388608	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 8388608 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 8388608 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-8388608	1	2	3	4	5
@@ -22713,12 +22737,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	1	2	3	4	5
@@ -28627,12 +28659,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	26	27	28	29	30
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 2147483648 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 2147483648 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-2147483648	1	2	3	4	5
@@ -32275,8 +32315,6 @@ total_rows	min_value	max(c1)
 23	0	18446744073709551615
 SELECT * FROM t2 WHERE c2 = -9223372036854775809;
 c1	c2	c3	c4	c5	c6	c7
-Warning	1292	Truncated incorrect DECIMAL value: ''
-Warnings:
 SELECT c1,c6 FROM t2;
 c1	c6
 0	0
@@ -34112,20 +34150,12 @@ c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 SELECT * FROM t3 WHERE c2 = -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 = -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 = -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 = -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <> -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34149,14 +34179,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 18446744073709551615	9223372036854775807	26	27	28	29	30
 18446744073709551615	9223372036854775807	36	37	38	39	40
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <> -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 > -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34180,14 +34206,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 18446744073709551615	9223372036854775807	26	27	28	29	30
 18446744073709551615	9223372036854775807	36	37	38	39	40
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 > -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34211,38 +34233,22 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 18446744073709551615	9223372036854775807	26	27	28	29	30
 18446744073709551615	9223372036854775807	36	37	38	39	40
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 < -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 < -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <= -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <= -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <=> -9223372036854775809 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <=> -9223372036854775809 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34266,14 +34272,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 18446744073709551615	9223372036854775807	26	27	28	29	30
 18446744073709551615	9223372036854775807	36	37	38	39	40
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34285,13 +34287,9 @@ c1	c2	c3	c4	c5	c6	c7
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IS NULL ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 105	NULL	102	103	104	105	106
@@ -34348,14 +34346,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	22	23	24	25	26
 18446744073709551615	9223372036854775807	36	37	38	39	40
 18446744073709551615	9223372036854775807	26	27	28	29	30
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <> -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 0	-9223372036854775808	1	2	3	4	5
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 > -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
@@ -34379,14 +34373,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	22	23	24	25	26
 18446744073709551615	9223372036854775807	36	37	38	39	40
 18446744073709551615	9223372036854775807	26	27	28	29	30
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 > -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 0	-9223372036854775808	1	2	3	4	5
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
@@ -34410,38 +34400,22 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	22	23	24	25	26
 18446744073709551615	9223372036854775807	36	37	38	39	40
 18446744073709551615	9223372036854775807	26	27	28	29	30
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 0	-9223372036854775808	1	2	3	4	5
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 < -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 < -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <= -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <= -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <=> -9223372036854775809 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 <=> -9223372036854775809 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
@@ -34465,14 +34439,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	22	23	24	25	26
 18446744073709551615	9223372036854775807	36	37	38	39	40
 18446744073709551615	9223372036854775807	26	27	28	29	30
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 0	-9223372036854775808	1	2	3	4	5
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
@@ -34484,13 +34454,9 @@ c1	c2	c3	c4	c5	c6	c7
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IS NULL ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 105	NULL	102	103	104	105	106
@@ -34611,12 +34577,20 @@ c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 = 9223372036854775808 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t3 WHERE c2 <> 9223372036854775808 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34733,14 +34707,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	27	28	29	30	31
 18446744073709551615	9223372036854775807	26	27	28	29	30
 18446744073709551615	9223372036854775807	36	37	38	39	40
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	1	2	3	4	5
@@ -34752,13 +34722,9 @@ c1	c2	c3	c4	c5	c6	c7
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IS NULL ORDER BY c2,c7;
 c1	c2	c3	c4	c5	c6	c7
 105	NULL	102	103	104	105	106
@@ -34908,14 +34874,10 @@ c1	c2	c3	c4	c5	c6	c7
 0	124	22	23	24	25	26
 18446744073709551615	9223372036854775807	36	37	38	39	40
 18446744073709551615	9223372036854775807	26	27	28	29	30
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 BETWEEN -9223372036854775809 AND 9223372036854775808 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
 0	-9223372036854775808	1	2	3	4	5
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IN (-9223372036854775809,9223372036854775808) ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
@@ -34927,13 +34889,9 @@ c1	c2	c3	c4	c5	c6	c7
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 >= -9223372036854775809 AND c2 < 9223372036854775808 AND c7 = 35 ORDER BY c2,c7 DESC LIMIT 2;
 c1	c2	c3	c4	c5	c6	c7
 0	-9223372036854775808	31	32	33	34	35
-Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
 SELECT * FROM t3 WHERE c2 IS NULL ORDER BY c2,c7 DESC;
 c1	c2	c3	c4	c5	c6	c7
 105	NULL	102	103	104	105	106
diff --git a/mysql-test/suite/engines/iuds/r/insert_time.result b/mysql-test/suite/engines/iuds/r/insert_time.result
index bb7ad5d7c0b..39bbb0f179d 100644
--- a/mysql-test/suite/engines/iuds/r/insert_time.result
+++ b/mysql-test/suite/engines/iuds/r/insert_time.result
@@ -40,12 +40,12 @@ INSERT INTO t4 VALUES('10.22.22','10.22.22','2009-01-26'),(1234567,1234567,'2009
 Warnings:
 Warning	1265	Data truncated for column 'c1' at row 1
 Warning	1265	Data truncated for column 'c2' at row 1
-Warning	1264	Out of range value for column 'c1' at row 2
-Warning	1264	Out of range value for column 'c2' at row 2
-Warning	1264	Out of range value for column 'c1' at row 3
-Warning	1264	Out of range value for column 'c2' at row 3
-Warning	1264	Out of range value for column 'c1' at row 4
-Warning	1264	Out of range value for column 'c2' at row 4
+Warning	1265	Data truncated for column 'c1' at row 2
+Warning	1265	Data truncated for column 'c2' at row 2
+Warning	1265	Data truncated for column 'c1' at row 3
+Warning	1265	Data truncated for column 'c2' at row 3
+Warning	1265	Data truncated for column 'c1' at row 4
+Warning	1265	Data truncated for column 'c2' at row 4
 Warning	1265	Data truncated for column 'c1' at row 6
 Warning	1265	Data truncated for column 'c2' at row 6
 INSERT INTO t1 VALUES('8:29:45',NULL,'2009-02-01');
@@ -135,6 +135,8 @@ c1	c2	c3
 -838:59:59	-838:59:59	2009-01-08
 00:00:00	00:00:00	2009-01-09
 00:00:00	00:00:00	2009-01-27
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 00:00:10	00:00:10	2009-01-26
 00:00:11	00:00:11	2009-01-20
 00:00:12	00:00:12	2009-01-13
@@ -160,8 +162,6 @@ c1	c2	c3
 491:22:33	491:22:33	2009-01-04
 825:23:00	825:23:00	2009-01-05
 838:59:59	838:59:59	2009-01-10
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
 SELECT * FROM t1;
 c1	c2	c3
 -838:59:59	-838:59:59	2009-01-21
@@ -1650,8 +1650,10 @@ SELECT * FROM t1 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 LIMIT 2;
@@ -1723,8 +1725,10 @@ SELECT * FROM t1 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c2 DESC LIMIT 2;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 IN (NULL,'10:22:33') ORDER BY c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 DESC;
 c1	c2	c3
 SELECT * FROM t1 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c2 DESC LIMIT 2;
@@ -3218,8 +3222,10 @@ SELECT * FROM t2 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 LIMIT 2;
@@ -3287,8 +3293,10 @@ SELECT * FROM t2 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 DESC LIMIT
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC;
 c1	c2	c3
 SELECT * FROM t2 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC LIMIT 2;
@@ -4814,8 +4822,10 @@ SELECT * FROM t3 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 LIMIT 2;
@@ -4887,8 +4897,10 @@ SELECT * FROM t3 WHERE c2 BETWEEN NULL AND '10:22:33' ORDER BY c1,c2 DESC LIMIT
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 IN (NULL,'10:22:33') ORDER BY c1,c2 DESC LIMIT 2;
 c1	c2	c3
+10:22:33	10:22:33	2009-01-02
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC;
 c1	c2	c3
 SELECT * FROM t3 WHERE c2 >= NULL AND c2 < '10:22:33' AND c1 = '491:22:33' ORDER BY c1,c2 DESC LIMIT 2;
@@ -5008,28 +5020,24 @@ c1	MIN(c2)
 838:59:59	838:59:59
 SELECT CAST(235959.123456 AS TIME);
 CAST(235959.123456 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(0.235959123456e+6 AS TIME);
 CAST(0.235959123456e+6 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(235959123456e-6 AS TIME);
 CAST(235959123456e-6 AS TIME)
-23:59:59.123456
+23:59:59
 SELECT CAST(235959.1234567 AS TIME);
 CAST(235959.1234567 AS TIME)
-23:59:59.123456
-Warnings:
-Warning	1292	Truncated incorrect time value: '235959.1234567'
+23:59:59
 SELECT CAST(0.2359591234567e6 AS TIME);
 CAST(0.2359591234567e6 AS TIME)
-23:59:59.123456
-Warnings:
-Warning	1292	Truncated incorrect time value: '235959.1234567'
+23:59:59
 SELECT CAST(0.2359591234567e+30 AS TIME);
 CAST(0.2359591234567e+30 AS TIME)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '2.359591234567e29'
+Warning	1292	Incorrect datetime value: '2.359591234567e29'
 select cast('100:55:50' as time) < cast('24:00:00' as time);
 cast('100:55:50' as time) < cast('24:00:00' as time)
 0
@@ -5077,7 +5085,6 @@ c1	c2	c3
 INSERT INTO t2(c1,c2) VALUES('12:34:56.78','12:34:56.78') ON DUPLICATE KEY UPDATE c1='12:34:56.79',c2='12:34:57.78';
 SELECT * FROM t2 WHERE c1='12:34:56.79' AND c2='12:34:57.78' /* 1 row */;
 c1	c2	c3
-12:34:56	12:34:57	2009-01-01
 SELECT * FROM t1 WHERE c1='10:22:35' AND c2='33 9:23' /* no rows */;
 c1	c2	c3
 INSERT INTO t1(c1,c2) VALUES('10:22:34','34 9:23') ON DUPLICATE KEY UPDATE c1='10:22:35',c2='33 9:23';
@@ -5137,8 +5144,8 @@ c1	c2	c3
 09:36:00	09:36:00	2009-01-25
 00:00:10	00:00:10	2009-01-26
 00:00:00	00:00:00	2009-01-27
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 262:22:00	262:22:00	2009-01-30
 00:00:12	00:00:12	2009-01-31
 08:29:45	NULL	2009-02-01
@@ -5146,15 +5153,39 @@ c1	c2	c3
 TRUNCATE TABLE t5;
 INSERT INTO t5 SELECT * FROM t4 WHERE c1 >='12colon34colon56';
 Warnings:
-Warning	1292	Incorrect time value: '12colon34colon56' for column 'c1' at row 1
+Warning	1292	Truncated incorrect time value: '12colon34colon56'
 SELECT * FROM t5;
 c1	c2	c3
+12:34:56	12:34:56	2009-01-01
+10:22:33	10:22:33	2009-01-02
+01:23:00	01:23:00	2009-01-03
 491:22:33	491:22:33	2009-01-04
 825:23:00	825:23:00	2009-01-05
+10:00:00	10:00:00	2009-01-06
+00:00:45	00:00:45	2009-01-07
+00:00:00	00:00:00	2009-01-09
 838:59:59	838:59:59	2009-01-10
-838:59:59	838:59:59	2009-01-28
-838:59:59	838:59:59	2009-01-29
+10:11:12	10:11:12	2009-01-11
+11:11:12	11:11:12	2009-01-12
+00:00:12	00:00:12	2009-01-13
+00:12:34	00:12:34	2009-01-14
+12:34:58	12:34:58	2009-01-15
+12:35:56	12:35:56	2009-01-16
+11:11:27	11:11:27	2009-01-17
+08:03:02	08:03:02	2009-01-18
+00:11:12	00:11:12	2009-01-19
+00:00:11	00:00:11	2009-01-20
+00:12:30	00:12:30	2009-01-23
+09:00:45	09:00:45	2009-01-24
+09:36:00	09:36:00	2009-01-25
+00:00:10	00:00:10	2009-01-26
+00:00:00	00:00:00	2009-01-27
+00:00:00	00:00:00	2009-01-28
+00:00:00	00:00:00	2009-01-29
 262:22:00	262:22:00	2009-01-30
+00:00:12	00:00:12	2009-01-31
+08:29:45	NULL	2009-02-01
+00:00:00	07:23:55	NULL
 TRUNCATE TABLE t5;
 DROP TABLE t5;
 DROP TABLE t1,t2,t3,t4;
diff --git a/mysql-test/suite/engines/iuds/r/insert_year.result b/mysql-test/suite/engines/iuds/r/insert_year.result
index 386c8090434..b9618ba4e2d 100644
--- a/mysql-test/suite/engines/iuds/r/insert_year.result
+++ b/mysql-test/suite/engines/iuds/r/insert_year.result
@@ -3235,9 +3235,21 @@ c1	c2	c3	c4
 1999	1999	1998-12-30	1998-12-30 11:30:45
 DROP TABLE t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1), UNIQUE INDEX(c2));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 CREATE TABLE t2(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, PRIMARY KEY(c1,c2));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 CREATE TABLE t3(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME, UNIQUE INDEX idx(c1,c2));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 CREATE TABLE t4(c1 YEAR(2) NOT NULL, c2 YEAR(2) NULL, c3 DATE, c4 DATETIME);
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 INSERT INTO t1 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
 INSERT INTO t2 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
 INSERT INTO t3 VALUES('1901','1901','98-12-31','98.12.31 11:30:45'),('1999','1999','98-12-30','98.12.30 11:30:45'),('2000','2000','98-12-29','98.12.29 11:30:45'),('2001','2001','98-12-28','98.12.28 11:30:45'),('2099','2099','98-12-27','98.12.27 11:30:45'),('2100','2100','98-12-26','98.12.26 11:30:45'),('2155','2155','98-12-26','98.12.26 11:30:45');
diff --git a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
index 47e5234f795..e01c7d78680 100644
--- a/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
+++ b/mysql-test/suite/engines/iuds/r/type_bit_iuds.result
@@ -55941,7 +55941,7 @@ SELECT 0 + (101010101010101010101010101010<<0);
 0 + (101010101010101010101010101010<<0)
 9223372036854775807
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(0));
 CREATE TABLE t2(c1 BIT(0), c2 BIT(0), c3 BIT(0));
 INSERT INTO t1 VALUES (b'101010101010101010101010101010');
@@ -56712,7 +56712,7 @@ SELECT 0 + (101010101010101010101010101010<<1);
 0 + (101010101010101010101010101010<<1)
 18446744073709551614
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(1));
 CREATE TABLE t2(c1 BIT(1), c2 BIT(1), c3 BIT(1));
 set @v1=1;
@@ -57532,7 +57532,7 @@ SELECT 0 + (101010101010101010101010101010<<2);
 0 + (101010101010101010101010101010<<2)
 18446744073709551612
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(2));
 CREATE TABLE t2(c1 BIT(2), c2 BIT(2), c3 BIT(2));
 set @v1=2;
@@ -58375,7 +58375,7 @@ SELECT 0 + (101010101010101010101010101010<<4);
 0 + (101010101010101010101010101010<<4)
 18446744073709551600
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(4));
 CREATE TABLE t2(c1 BIT(4), c2 BIT(4), c3 BIT(4));
 set @v1=4;
@@ -59296,7 +59296,7 @@ SELECT 0 + (101010101010101010101010101010<<8);
 0 + (101010101010101010101010101010<<8)
 18446744073709551360
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(8));
 CREATE TABLE t2(c1 BIT(8), c2 BIT(8), c3 BIT(8));
 set @v1=8;
@@ -60503,7 +60503,7 @@ SELECT 0 + (101010101010101010101010101010<<16);
 0 + (101010101010101010101010101010<<16)
 18446744073709486080
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(16));
 CREATE TABLE t2(c1 BIT(16), c2 BIT(16), c3 BIT(16));
 set @v1=16;
@@ -61915,7 +61915,7 @@ SELECT 0 + (101010101010101010101010101010<<32);
 0 + (101010101010101010101010101010<<32)
 18446744069414584320
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(32));
 CREATE TABLE t2(c1 BIT(32), c2 BIT(32), c3 BIT(32));
 set @v1=32;
@@ -63988,7 +63988,7 @@ SELECT 0 + (101010101010101010101010101010<<64);
 0 + (101010101010101010101010101010<<64)
 0
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(64));
 CREATE TABLE t2(c1 BIT(64), c2 BIT(64), c3 BIT(64));
 set @v1=64;
@@ -67165,7 +67165,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<0)
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<0)
 9223372036854775807
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(0));
 CREATE TABLE t2(c1 BIT(0), c2 BIT(0), c3 BIT(0));
 INSERT INTO t1 VALUES (b'1010101010101010101010101010101010101010101010101010101010101010');
@@ -67933,7 +67933,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<1)
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<1)
 18446744073709551614
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(1));
 CREATE TABLE t2(c1 BIT(1), c2 BIT(1), c3 BIT(1));
 set @v1=1;
@@ -68750,7 +68750,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<2)
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<2)
 18446744073709551612
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(2));
 CREATE TABLE t2(c1 BIT(2), c2 BIT(2), c3 BIT(2));
 set @v1=2;
@@ -69590,7 +69590,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<4)
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<4)
 18446744073709551600
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(4));
 CREATE TABLE t2(c1 BIT(4), c2 BIT(4), c3 BIT(4));
 set @v1=4;
@@ -70508,7 +70508,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<8)
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<8)
 18446744073709551360
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(8));
 CREATE TABLE t2(c1 BIT(8), c2 BIT(8), c3 BIT(8));
 set @v1=8;
@@ -71712,7 +71712,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<16
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<16)
 18446744073709486080
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(16));
 CREATE TABLE t2(c1 BIT(16), c2 BIT(16), c3 BIT(16));
 set @v1=16;
@@ -73121,7 +73121,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<32
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<32)
 18446744069414584320
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(32));
 CREATE TABLE t2(c1 BIT(32), c2 BIT(32), c3 BIT(32));
 set @v1=32;
@@ -75197,7 +75197,7 @@ SELECT 0 + (1010101010101010101010101010101010101010101010101010101010101010<<64
 0 + (1010101010101010101010101010101010101010101010101010101010101010<<64)
 0
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '1010101010101010101010101010101010101010101010101010101010101010' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(64));
 CREATE TABLE t2(c1 BIT(64), c2 BIT(64), c3 BIT(64));
 set @v1=64;
@@ -78374,7 +78374,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<0
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<0)
 9223372036854775807
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(0));
 CREATE TABLE t2(c1 BIT(0), c2 BIT(0), c3 BIT(0));
 INSERT INTO t1 VALUES (b'10101010101010101010101010101010101010101010101010101010101010101');
@@ -79142,7 +79142,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<1
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<1)
 18446744073709551614
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(1));
 CREATE TABLE t2(c1 BIT(1), c2 BIT(1), c3 BIT(1));
 set @v1=1;
@@ -79959,7 +79959,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<2
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<2)
 18446744073709551612
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(2));
 CREATE TABLE t2(c1 BIT(2), c2 BIT(2), c3 BIT(2));
 set @v1=2;
@@ -80799,7 +80799,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<4
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<4)
 18446744073709551600
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(4));
 CREATE TABLE t2(c1 BIT(4), c2 BIT(4), c3 BIT(4));
 set @v1=4;
@@ -81717,7 +81717,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<8
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<8)
 18446744073709551360
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(8));
 CREATE TABLE t2(c1 BIT(8), c2 BIT(8), c3 BIT(8));
 set @v1=8;
@@ -82921,7 +82921,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<1
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<16)
 18446744073709486080
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(16));
 CREATE TABLE t2(c1 BIT(16), c2 BIT(16), c3 BIT(16));
 set @v1=16;
@@ -84330,7 +84330,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<3
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<32)
 18446744069414584320
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(32));
 CREATE TABLE t2(c1 BIT(32), c2 BIT(32), c3 BIT(32));
 set @v1=32;
@@ -86406,7 +86406,7 @@ SELECT 0 + (10101010101010101010101010101010101010101010101010101010101010101<<6
 0 + (10101010101010101010101010101010101010101010101010101010101010101<<64)
 0
 Warnings:
-Warning	1292	Truncated incorrect DECIMAL value: ''
+Warning	1916	Got overflow when converting '10101010101010101010101010101010101010101010101010101010101010101' to INT. Value truncated.
 CREATE TABLE t1(c1 BIT(64));
 CREATE TABLE t2(c1 BIT(64), c2 BIT(64), c3 BIT(64));
 set @v1=64;
diff --git a/mysql-test/suite/engines/iuds/r/update_delete_calendar.result b/mysql-test/suite/engines/iuds/r/update_delete_calendar.result
index a04585dfd72..e8324c8b368 100644
--- a/mysql-test/suite/engines/iuds/r/update_delete_calendar.result
+++ b/mysql-test/suite/engines/iuds/r/update_delete_calendar.result
@@ -71,13 +71,6 @@ Warning	1265	Data truncated for column 'c2' at row 1
 SELECT count(*) FROM t1 WHERE c2='10:45:15' OR c2='2009-01-32' OR c2='2009-02-30' OR c2='2009-04-31' OR c2='2009-06-31' OR c2='2009-09-31' /* returns 0 */;
 count(*)
 0
-Warnings:
-Warning	1292	Incorrect date value: '10:45:15' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '2009-01-32' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '10:45:15' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '2009-01-32' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '10:45:15' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '2009-01-32' for column 'c2' at row 1
 UPDATE t1 SET c2='2009-11-31' WHERE c2='2001-01-16';
 Warnings:
 Warning	1265	Data truncated for column 'c2' at row 1
@@ -108,8 +101,7 @@ c1	c2	c3
 2001-01-16	0000-00-00	12
 2001-01-17	0000-00-00	13
 Warnings:
-Warning	1292	Incorrect date value: '0000-00-00' for column 'c2' at row 1
-Warning	1292	Incorrect date value: '0000-00-00' for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
 UPDATE t1 SET c2='0000-00-00' WHERE c2='2001-01-18';
 ERROR 22007: Incorrect date value: '0000-00-00' for column 'c2' at row 1
 SET SQL_MODE=DEFAULT;
@@ -774,20 +766,17 @@ c1	c2	c3
 INSERT INTO t1 VALUES('2001-01-09','2001-01-10',6),('2001-01-11','2001-01-12',7);
 UPDATE t1 SET c1='2001-01-09 24:59:59',c2='2009-01-10 23:60:59' WHERE c1='2001-01-09';
 Warnings:
-Warning	1264	Out of range value for column 'c1' at row 1
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1265	Data truncated for column 'c1' at row 1
+Warning	1265	Data truncated for column 'c2' at row 1
 UPDATE t1 SET c2='2001-01-11 23:59:60' WHERE c1='2001-01-11';
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 1
+Warning	1265	Data truncated for column 'c2' at row 1
 SELECT count(*) FROM t1 WHERE c1='2001-01-09 24:59:59' AND c2='2009-01-10 23:60:59';
 count(*)
 1
 Warnings:
-Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59' for column 'c1' at row 1
-Warning	1292	Incorrect datetime value: '2009-01-10 23:60:59' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59' for column 'c1' at row 1
-Warning	1292	Truncated incorrect datetime value: '2001-01-09 24:59:59'
-Warning	1292	Truncated incorrect datetime value: '2009-01-10 23:60:59'
+Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59'
+Warning	1292	Incorrect datetime value: '2009-01-10 23:60:59'
 SELECT count(*) FROM t1 WHERE c2='2001-01-11 23:59:60' /* returns 0 */;
 count(*)
 0
@@ -806,8 +795,7 @@ c1	c2	c3
 2001-01-11 00:00:00	0000-00-00 00:00:00	7
 2001-01-17 00:00:00	0000-00-00 00:00:00	8
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
+Warning	1264	Out of range value for column 'c2' at row 1
 UPDATE t1 SET c2='0000-00-00 00:00:00' WHERE c2='2001-01-18 07:35';
 ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
 SET SQL_MODE=DEFAULT;
@@ -949,15 +937,13 @@ c1	c2	c3
 2003-01-01 01:02:03	2002-01-09 01:30:30	10
 UPDATE t1 SET c1='2003-01-01 1:2:3' WHERE c2 BETWEEN '20020109 01:30:40' AND '20020109 01:30:50' ORDER BY c2 LIMIT 2;
 Warnings:
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:50' for column 'c2' at row 1
+Warning	1292	Incorrect datetime value: '20020109 01:30:40'
+Warning	1292	Incorrect datetime value: '20020109 01:30:50'
 SELECT * FROM t1 WHERE c2 BETWEEN '20020109 01:30:40' AND '20020109 01:30:50' ORDER BY c2;
 c1	c2	c3
 Warnings:
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:50' for column 'c2' at row 1
+Warning	1292	Incorrect datetime value: '20020109 01:30:40'
+Warning	1292	Incorrect datetime value: '20020109 01:30:50'
 UPDATE t1 SET c1='2003-01-01 1:2:3' WHERE c2 IN('2002-01-09 1:30:55','2002-01-09 2:00') ORDER BY c2 DESC LIMIT 2;
 SELECT * FROM t1 WHERE c2 IN('2002-01-09 1:30:55','2002-01-09 2:00') ORDER BY c2 DESC;
 c1	c2	c3
@@ -1389,17 +1375,13 @@ SELECT count(*) FROM t1 WHERE c1='2001-01-09 24:59:59' AND c2='2009-01-10 23:60:
 count(*)
 1
 Warnings:
-Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59' for column 'c1' at row 1
-Warning	1292	Incorrect datetime value: '2009-01-10 23:60:59' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59' for column 'c1' at row 1
-Warning	1292	Truncated incorrect datetime value: '2001-01-09 24:59:59'
-Warning	1292	Truncated incorrect datetime value: '2009-01-10 23:60:59'
+Warning	1292	Incorrect datetime value: '2001-01-09 24:59:59'
+Warning	1292	Incorrect datetime value: '2009-01-10 23:60:59'
 SELECT count(*) FROM t1 WHERE c1='2001-01-11 23:59:59' AND c2='2001-01-11 23:59:60';
 count(*)
 1
 Warnings:
-Warning	1292	Incorrect datetime value: '2001-01-11 23:59:60' for column 'c2' at row 1
-Warning	1292	Truncated incorrect datetime value: '2001-01-11 23:59:60'
+Warning	1292	Incorrect datetime value: '2001-01-11 23:59:60'
 SELECT * FROM t1 WHERE c1='0000-00-00 00:00:00' OR c2='0000-00-00 00:00:00';
 c1	c2	c3
 0000-00-00 00:00:00	0000-00-00 00:00:00	6
@@ -1412,8 +1394,7 @@ c1	c2	c3
 2001-01-11 23:59:59	0000-00-00 00:00:00	7
 2001-01-17 00:00:00	0000-00-00 00:00:00	8
 Warnings:
-Warning	1292	Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
+Warning	1265	Data truncated for column 'c2' at row 1
 UPDATE t1 SET c1='1972-01-01 07:35',c2='0000-00-00 00:00:00' WHERE c2='2001-01-18 07:35';
 ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c2' at row 1
 SET SQL_MODE=DEFAULT;
@@ -1552,15 +1533,13 @@ c1	c2	c3
 2003-01-01 01:02:03	2002-01-09 01:30:30	10
 UPDATE t1 SET c1='2003-01-01 1:2:3' WHERE c2 BETWEEN '20020109 01:30:40' AND '20020109 01:30:50' ORDER BY c2 LIMIT 2;
 Warnings:
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:50' for column 'c2' at row 1
+Warning	1292	Incorrect datetime value: '20020109 01:30:40'
+Warning	1292	Incorrect datetime value: '20020109 01:30:50'
 SELECT * FROM t1 WHERE c2 BETWEEN '20020109 01:30:40' AND '20020109 01:30:50' ORDER BY c2;
 c1	c2	c3
 Warnings:
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:40' for column 'c2' at row 1
-Warning	1292	Incorrect datetime value: '20020109 01:30:50' for column 'c2' at row 1
+Warning	1292	Incorrect datetime value: '20020109 01:30:40'
+Warning	1292	Incorrect datetime value: '20020109 01:30:50'
 UPDATE t1 SET c1='2003-01-01 1:2:3' WHERE c2 IN('2002-01-09 1:30:55','2002-01-09 2:00') ORDER BY c2 DESC LIMIT 2;
 SELECT * FROM t1 WHERE c2 IN('2002-01-09 1:30:55','2002-01-09 2:00') ORDER BY c2 DESC;
 c1	c2	c3
diff --git a/mysql-test/suite/engines/iuds/r/update_delete_number.result b/mysql-test/suite/engines/iuds/r/update_delete_number.result
index 8e190870092..7c183068724 100644
--- a/mysql-test/suite/engines/iuds/r/update_delete_number.result
+++ b/mysql-test/suite/engines/iuds/r/update_delete_number.result
@@ -56,6 +56,8 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=4294967296 AND c2=2147483648 /* no rows */;
 COUNT(*)
 0
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=4294967295 AND c2=2147483647;
 c1	c2	c3
 4294967295	2147483647	10
@@ -1150,6 +1152,8 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=256 AND c2=128 /* no rows */;
 COUNT(*)
 0
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=255 AND c2=127;
 c1	c2	c3
 255	127	10
@@ -1922,6 +1926,8 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=65536 AND c2=32768 /* no rows */;
 COUNT(*)
 0
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=65535 AND c2=32767;
 c1	c2	c3
 65535	32767	10
@@ -2669,6 +2675,8 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=16777216 AND c2=8388608 /* no rows */;
 COUNT(*)
 0
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=16777215 AND c2=8388607;
 c1	c2	c3
 16777215	8388607	10
@@ -3416,6 +3424,8 @@ Warning	1264	Out of range value for column 'c2' at row 3
 SELECT COUNT(*) FROM t1 WHERE c1=18446744073709551616 AND c2=9223372036854775808 /* no rows */;
 COUNT(*)
 0
+Warnings:
+Warning	1264	Out of range value for column 'c2' at row 1
 SELECT * FROM t1 WHERE c1=18446744073709551615 AND c2=9223372036854775807;
 c1	c2	c3
 18446744073709551615	9223372036854775807	10
diff --git a/mysql-test/suite/engines/iuds/r/update_time.result b/mysql-test/suite/engines/iuds/r/update_time.result
index 3073f3c985f..09a7cbf0c7f 100644
--- a/mysql-test/suite/engines/iuds/r/update_time.result
+++ b/mysql-test/suite/engines/iuds/r/update_time.result
@@ -793,10 +793,10 @@ c2
 00:09:09
 00:11:11
 00:11:11
+00:11:11
 00:13:13
 00:51:51
 01:01:01
-02:02:02
 03:03:00
 08:08:08
 100:04:04
@@ -1122,7 +1122,7 @@ c2
 838:59:59
 NULL
 UPDATE t4 SET c1=11:11:11 WHERE c2=NULL;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near ':11:11 WHERE c2=NULL' at line 1
 SELECT c1 FROM t4;
 c1
 00:00:01
@@ -1262,7 +1262,7 @@ c1	c2
 838:59:59	838:59:59
 UPDATE t1 SET c1=c1+1,c2=c2-1 WHERE c1 IN (222222,8385955,1500000) ORDER BY c1;
 Warnings:
-Warning	1264	Out of range value for column 'c2' at row 2
+Warning	1265	Data truncated for column 'c2' at row 2
 SELECT * FROM t1;
 c1	c2
 -12:12:12	12:12:12
@@ -1332,7 +1332,7 @@ c1	c2
 00:51:51	02:22:22
 00:54:54	00:54:54
 01:01:01	02:22:22
-02:02:02	02:22:22
+02:02:02	02:02:02
 03:03:00	02:22:22
 08:08:08	00:00:00
 100:04:04	100:04:04
@@ -1374,7 +1374,7 @@ c1	c2
 00:51:51	00:51:51
 00:54:54	00:11:11
 01:01:01	01:01:01
-02:02:02	02:02:02
+02:02:02	00:11:11
 03:03:00	03:03:00
 08:08:08	08:08:08
 11:11:11	00:11:11
diff --git a/mysql-test/suite/engines/iuds/r/update_year.result b/mysql-test/suite/engines/iuds/r/update_year.result
index 1b0ead45314..c762d70a276 100644
--- a/mysql-test/suite/engines/iuds/r/update_year.result
+++ b/mysql-test/suite/engines/iuds/r/update_year.result
@@ -2,7 +2,13 @@ DROP TABLE IF EXISTS t1,t2,t3,t4;
 CREATE TABLE t1(c1 YEAR NOT NULL,c2 YEAR, PRIMARY KEY(c1));
 CREATE TABLE t2(c1 YEAR NOT NULL, c2 YEAR, UNIQUE INDEX idx(c1,c2));
 CREATE TABLE t3(c1 YEAR(2) NOT NULL,c2 YEAR(2), PRIMARY KEY(c1));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 CREATE TABLE t4(c1 YEAR(2), c2 YEAR(2), UNIQUE INDEX idx(c1,c2));
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
 INSERT INTO t1 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t2 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);
 INSERT INTO t3 VALUES (1901,1901),(1970,1970),(1999,1999),(2000,2000),(2155,2155);