21 files changed, 256 insertions, 138 deletions
diff --git a/mysql-test/main/cast.result b/mysql-test/main/cast.result
index ca314573581..f1e7eb7b502 100644
--- a/mysql-test/main/cast.result
+++ b/mysql-test/main/cast.result
@@ -313,7 +313,7 @@ select cast('' as time);
 cast('' as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: ''
+Warning	1292	Incorrect time value: ''
 select cast(NULL as DATE);
 cast(NULL as DATE)
 NULL
diff --git a/mysql-test/main/date_formats.result b/mysql-test/main/date_formats.result
index 16dbdf7969c..463cce39520 100644
--- a/mysql-test/main/date_formats.result
+++ b/mysql-test/main/date_formats.result
@@ -442,7 +442,7 @@ f1	f2	f3
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '2003-01-02 10:11:12.0012ABCD'
 Warning	1292	Truncated incorrect time value: '-01:01:01.01 GGG'
-Warning	1292	Truncated incorrect time value: '1997-12-31 23:59:59.01XXXX'
+Warning	1292	Truncated incorrect datetime value: '1997-12-31 23:59:59.01XXXX'
 select str_to_date("2003-04-05  g", "%Y-%m-%d") as f1,
 str_to_date("2003-04-05 10:11:12.101010234567", "%Y-%m-%d %H:%i:%S.%f") as f2;
 f1	f2
diff --git a/mysql-test/main/dyncol.result b/mysql-test/main/dyncol.result
index 7a5eeac67cc..cc9a94e74be 100644
--- a/mysql-test/main/dyncol.result
+++ b/mysql-test/main/dyncol.result
@@ -1028,12 +1028,12 @@ select column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as tim
 column_get(column_create(1, "2011-02-32 8:46:06.23434" AS CHAR), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '2011-02-32 8:46:06.23434'
+Warning	1292	Incorrect time value: '2011-02-32 8:46:06.23434'
 select column_get(column_create(1, "2011-13-01 8:46:06.23434" AS CHAR), 1 as time);
 column_get(column_create(1, "2011-13-01 8:46:06.23434" AS CHAR), 1 as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '2011-13-01 8:46:06.23434'
+Warning	1292	Incorrect time value: '2011-13-01 8:46:06.23434'
 select column_get(column_create(1, "2011-02-30 8:46:06.23434" AS CHAR), 1 as time);
 column_get(column_create(1, "2011-02-30 8:46:06.23434" AS CHAR), 1 as time)
 08:46:06
diff --git a/mysql-test/main/func_in.result b/mysql-test/main/func_in.result
index a86781b156c..acf718c453e 100644
--- a/mysql-test/main/func_in.result
+++ b/mysql-test/main/func_in.result
@@ -481,7 +481,7 @@ SELECT * FROM t4 WHERE a IN ('1972-02-06','19772-07-29');
 a
 1972-02-06
 Warnings:
-Warning	1292	Incorrect datetime value: '19772-07-29'
+Warning	1292	Truncated incorrect datetime value: '19772-07-29'
 DROP TABLE t1,t2,t3,t4;
 CREATE TABLE t1 (id int not null);
 INSERT INTO t1 VALUES (1),(2);
diff --git a/mysql-test/main/func_sapdb.result b/mysql-test/main/func_sapdb.result
index 49e597a7811..27f1d74bc41 100644
--- a/mysql-test/main/func_sapdb.result
+++ b/mysql-test/main/func_sapdb.result
@@ -184,7 +184,7 @@ select time("1997-12-31 25:59:59.000001");
 time("1997-12-31 25:59:59.000001")
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '1997-12-31 25:59:59.000001'
+Warning	1292	Incorrect time value: '1997-12-31 25:59:59.000001'
 select microsecond("1997-12-31 23:59:59.000001");
 microsecond("1997-12-31 23:59:59.000001")
 1
diff --git a/mysql-test/main/func_time.result b/mysql-test/main/func_time.result
index a6def9e70b0..a6e1ed9cb19 100644
--- a/mysql-test/main/func_time.result
+++ b/mysql-test/main/func_time.result
@@ -941,7 +941,7 @@ f1
 select f1 from t1 where cast("2006-1-1" as date) between f1 and cast('zzz' as date);
 f1
 Warnings:
-Warning	1292	Incorrect datetime value: 'zzz'
+Warning	1292	Truncated incorrect datetime value: 'zzz'
 select f1 from t1 where makedate(2006,1) between date(f1) and date(f3);
 f1
 2006-01-01
@@ -1105,7 +1105,7 @@ week(20061108), week(20061108.01), week(20061108085411.000002);
 isnull(week(now() + 0))	isnull(week(now() + 0.2))	week(20061108)	week(20061108.01)	week(20061108085411.000002)
 0	0	45	45	45
 Warnings:
-Note	1292	Truncated incorrect datetime value: '20061108.01'
+Note	1292	Truncated incorrect date value: '20061108.01'
 End of 4.1 tests
 select time_format('100:00:00', '%H %k %h %I %l');
 time_format('100:00:00', '%H %k %h %I %l')
@@ -1382,9 +1382,9 @@ SELECT COUNT(*) FROM t1 GROUP BY TIME_TO_SEC(a);
 COUNT(*)
 2
 Warnings:
-Warning	1292	Truncated incorrect time value: ''
-Warning	1292	Truncated incorrect time value: ''
-Warning	1292	Truncated incorrect time value: ''
+Warning	1292	Incorrect time value: ''
+Warning	1292	Incorrect time value: ''
+Warning	1292	Incorrect time value: ''
 DROP TABLE t1;
 #
 # Bug#11766112  59151:UNINITIALIZED VALUES IN EXTRACT_DATE_TIME WITH STR_TO_DATE(SPACE(..) ...
@@ -1735,7 +1735,7 @@ select 1 from t1 where 1 < some (select cast(a as datetime) from t1);
 1
 1
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 drop table t1;
 SET timestamp=DEFAULT;
 #
@@ -1842,7 +1842,7 @@ select cast('131415.123e0' as time);
 cast('131415.123e0' as time)
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '131415.123e0'
+Warning	1292	Incorrect time value: '131415.123e0'
 select cast('2010-01-02 03:04:05' as datetime) between null and '2010-01-02 03:04:04';
 cast('2010-01-02 03:04:05' as datetime) between null and '2010-01-02 03:04:04'
 0
@@ -1918,7 +1918,7 @@ select least(1, f1) from t1;
 least(1, f1)
 0000-00-00 00:00:00
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 drop table t1;
 SET timestamp=UNIX_TIMESTAMP('2014-04-14 10:10:10');
 select now() > coalesce(time('21:43:24'), date('2010-05-03'));
@@ -6095,14 +6095,14 @@ SELECT TIME('42949672955959-01'), TIME('42949672965959-01');
 TIME('42949672955959-01')	TIME('42949672965959-01')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '42949672955959-01'
-Warning	1292	Truncated incorrect time value: '42949672965959-01'
+Warning	1292	Incorrect time value: '42949672955959-01'
+Warning	1292	Incorrect time value: '42949672965959-01'
 SELECT TIME('18446744073709551615-01'),  TIME('18446744073709551616-01');
 TIME('18446744073709551615-01')	TIME('18446744073709551616-01')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '18446744073709551615-01'
-Warning	1292	Truncated incorrect time value: '18446744073709551616-01'
+Warning	1292	Incorrect time value: '18446744073709551615-01'
+Warning	1292	Incorrect time value: '18446744073709551616-01'
 #
 # MDEV-17434 EXTRACT(DAY FROM negative_time) returns wrong result
 #
@@ -6158,7 +6158,7 @@ SELECT TIME('-2001-01-01 10:20:30');
 TIME('-2001-01-01 10:20:30')
 NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '-2001-01-01 10:20:30'
+Warning	1292	Incorrect time value: '-2001-01-01 10:20:30'
 SELECT TIME('2001-01-01') AS c1, TIME('2001-01-01  ') AS c2;
 c1	c2
 00:20:01	00:20:01
@@ -6210,20 +6210,20 @@ SELECT TIME('-xxx'), TIME('-xxxxxxxxxxxxxxxxxxxx');
 TIME('-xxx')	TIME('-xxxxxxxxxxxxxxxxxxxx')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '-xxx'
-Warning	1292	Truncated incorrect time value: '-xxxxxxxxxxxxxxxxxxxx'
+Warning	1292	Incorrect time value: '-xxx'
+Warning	1292	Incorrect time value: '-xxxxxxxxxxxxxxxxxxxx'
 SELECT TIME('-      '), TIME('-                         ');
 TIME('-      ')	TIME('-                         ')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '-      '
-Warning	1292	Truncated incorrect time value: '-                         '
+Warning	1292	Incorrect time value: '-      '
+Warning	1292	Incorrect time value: '-                         '
 SELECT TIME('-'), TIME('-');
 TIME('-')	TIME('-')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '-'
-Warning	1292	Truncated incorrect time value: '-'
+Warning	1292	Incorrect time value: '-'
+Warning	1292	Incorrect time value: '-'
 SELECT TIME('1-1-1 1:1:1'), TIME('1-1-1 1:1:1.0');
 TIME('1-1-1 1:1:1')	TIME('1-1-1 1:1:1.0')
 01:01:01	01:01:01.0
diff --git a/mysql-test/main/multi_update.result b/mysql-test/main/multi_update.result
index c40de47668a..9f9af8f79f8 100644
--- a/mysql-test/main/multi_update.result
+++ b/mysql-test/main/multi_update.result
@@ -603,11 +603,11 @@ CREATE TABLE t1 (f1 DATE);
 INSERT INTO t1 VALUES('2001-01-01');
 UPDATE IGNORE (SELECT 1 FROM t1 WHERE f1 = (SELECT f1() FROM t1)) x, t1 SET f1 = 1;
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 CREATE view v1 as SELECT f1() FROM t1;
 UPDATE IGNORE (SELECT 1 FROM t1 WHERE f1 = (select * from v1)) x, t1 SET f1 = 1;
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 DROP VIEW v1;
 DROP FUNCTION f1;
 DROP TABLE t1;
diff --git a/mysql-test/main/null.result b/mysql-test/main/null.result
index 2fa89a2d001..6601c5e1ed4 100644
--- a/mysql-test/main/null.result
+++ b/mysql-test/main/null.result
@@ -515,9 +515,9 @@ NULLIF(TIMESTAMP'2001-01-01 00:00:00',1e0),
 NULLIF(TIMESTAMP'2001-01-01 00:00:00','2001-01-01'),
 NULLIF(TIMESTAMP'2001-01-01 00:00:00',TIME'00:00:00');
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
-Warning	1292	Incorrect datetime value: '1.0'
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1.0'
+Warning	1292	Truncated incorrect datetime value: '1'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -536,9 +536,9 @@ NULLIF(DATE'2001-01-01',1e0),
 NULLIF(DATE'2001-01-01','2001-01-01'),
 NULLIF(DATE'2001-01-01',TIME'00:00:00');
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
-Warning	1292	Incorrect datetime value: '1.0'
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1.0'
+Warning	1292	Truncated incorrect datetime value: '1'
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1640,8 +1640,8 @@ CASE WHEN TIMESTAMP'2001-01-01 00:00:00'=1 THEN NULL
 ELSE TIMESTAMP'2001-01-01 00:00:00'
   END AS b;
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 DROP TABLE t1;
 #
 # MDEV-8785 Wrong results for EXPLAIN EXTENDED...WHERE NULLIF(latin1_col, _utf8'a' COLLATE utf8_bin) IS NOT NULL
diff --git a/mysql-test/main/range.result b/mysql-test/main/range.result
index 464c0bf031a..50de308045b 100644
--- a/mysql-test/main/range.result
+++ b/mysql-test/main/range.result
@@ -1101,7 +1101,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
+Warning	1292	Truncated incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1113,7 +1113,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
+Warning	1292	Truncated incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1563,7 +1563,7 @@ str_to_date('2007-10-00', '%Y-%m-%d') >= '' AND
 str_to_date('2007-10-00', '%Y-%m-%d') <= '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
 str_to_date('2007-20-00', '%Y-%m-%d') <= '';
 str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
@@ -1578,7 +1578,7 @@ SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
 str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
 str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
 NULL
diff --git a/mysql-test/main/range_mrr_icp.result b/mysql-test/main/range_mrr_icp.result
index b132e63b732..a6c57378f9c 100644
--- a/mysql-test/main/range_mrr_icp.result
+++ b/mysql-test/main/range_mrr_icp.result
@@ -1103,7 +1103,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
+Warning	1292	Truncated incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1115,7 +1115,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-01 24:00:00';
 item	started	price
 Warnings:
-Warning	1292	Incorrect datetime value: '2005-12-01 24:00:00'
+Warning	1292	Truncated incorrect datetime value: '2005-12-01 24:00:00'
 SELECT * FROM t1 WHERE item='A1' AND started<='2005-12-02 00:00:00';
 item	started	price
 A1	2005-11-01 08:00:00	1000.000
@@ -1565,7 +1565,7 @@ str_to_date('2007-10-00', '%Y-%m-%d') >= '' AND
 str_to_date('2007-10-00', '%Y-%m-%d') <= '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
 str_to_date('2007-20-00', '%Y-%m-%d') <= '';
 str_to_date('2007-20-00', '%Y-%m-%d') >= '2007/10/20' AND 
@@ -1580,7 +1580,7 @@ SELECT str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20';
 str_to_date('2007-10-00', '%Y-%m-%d') BETWEEN '' AND '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND '';
 str_to_date('2007-20-00', '%Y-%m-%d') BETWEEN '2007/10/20' AND ''
 NULL
diff --git a/mysql-test/main/select.result b/mysql-test/main/select.result
index 9b6a570717b..94a92315acc 100644
--- a/mysql-test/main/select.result
+++ b/mysql-test/main/select.result
@@ -2118,8 +2118,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -4111,7 +4111,7 @@ select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
@@ -4198,7 +4198,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4212,22 +4212,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1
@@ -5282,30 +5282,30 @@ SELECT * FROM t1 HAVING f1 = 'zz';
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'zz'
 SELECT * FROM t1 HAVING f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 WHERE f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM v1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 DROP TABLE t1;
 DROP VIEW v1;
 #
diff --git a/mysql-test/main/select_jcl6.result b/mysql-test/main/select_jcl6.result
index d78fad15da1..b45fb8c4c10 100644
--- a/mysql-test/main/select_jcl6.result
+++ b/mysql-test/main/select_jcl6.result
@@ -2129,8 +2129,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -4122,7 +4122,7 @@ select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
@@ -4209,7 +4209,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4223,22 +4223,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1
@@ -5293,30 +5293,30 @@ SELECT * FROM t1 HAVING f1 = 'zz';
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'zz'
 SELECT * FROM t1 HAVING f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 WHERE f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM v1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 DROP TABLE t1;
 DROP VIEW v1;
 #
diff --git a/mysql-test/main/select_pkeycache.result b/mysql-test/main/select_pkeycache.result
index 9b6a570717b..94a92315acc 100644
--- a/mysql-test/main/select_pkeycache.result
+++ b/mysql-test/main/select_pkeycache.result
@@ -2118,8 +2118,8 @@ INSERT INTO t2 VALUES (1,3,10,'2002-06-01 08:00:00',35),(1,3,1010,'2002-06-01 12
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= 'wrong-date-value' AND b.sampletime < 'wrong-date-value' AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 Warnings:
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
-Warning	1292	Incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
+Warning	1292	Truncated incorrect datetime value: 'wrong-date-value'
 SELECT a.gvid, (SUM(CASE b.sampletid WHEN 140 THEN b.samplevalue ELSE 0 END)) as the_success,(SUM(CASE b.sampletid WHEN 141 THEN b.samplevalue ELSE 0 END)) as the_fail,(SUM(CASE b.sampletid WHEN 142 THEN b.samplevalue ELSE 0 END)) as the_size,(SUM(CASE b.sampletid WHEN 143 THEN b.samplevalue ELSE 0 END)) as the_time FROM t1 a, t2 b WHERE a.hmid = b.hmid AND a.volid = b.volid AND b.sampletime >= NULL AND b.sampletime < NULL AND b.sampletid IN (140, 141, 142, 143) GROUP BY a.gvid;
 gvid	the_success	the_fail	the_size	the_time
 DROP TABLE t1,t2;
@@ -4111,7 +4111,7 @@ select str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6';
 str_to_date('2007-10-09','%Y-%m-%d') <= '2007/10/2000:00:00 GMT-6'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '2007/10/2000:00:00 GMT-6'
+Warning	1292	Truncated incorrect datetime value: '2007/10/2000:00:00 GMT-6'
 select str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6';
 str_to_date('2007-10-01','%Y-%m-%d') = '2007-10-1 00:00:00 GMT-6'
 1
@@ -4198,7 +4198,7 @@ select str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20';
 str_to_date('2007-10-00','%Y-%m-%d') between '' and '2007/10/20'
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20';
 str_to_date('','%Y-%m-%d') between '2007/10/01' and '2007/10/20'
 0
@@ -4212,22 +4212,22 @@ select str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = '';
 str_to_date('2007-10-00 12:34','%Y-%m-%d %H:%i') = ''
 0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('1','%Y-%m-%d') = '1';
 str_to_date('1','%Y-%m-%d') = '1'
 0
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 select str_to_date('','%Y-%m-%d') = '';
 str_to_date('','%Y-%m-%d') = ''
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01';
 str_to_date('2000-01-01','%Y-%m-%d') between '1000-01-01' and '2001-01-01'
 1
@@ -5282,30 +5282,30 @@ SELECT * FROM t1 HAVING f1 = 'zz';
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'zz'
 SELECT * FROM t1 HAVING f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM t1 WHERE f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 SELECT * FROM v1 HAVING f1 = 'zz' AND f1 <= 'aa' ;
 f1
 0000-00-00
 Warnings:
-Warning	1292	Incorrect datetime value: 'zz'
-Warning	1292	Incorrect datetime value: 'aa'
+Warning	1292	Truncated incorrect datetime value: 'zz'
+Warning	1292	Truncated incorrect datetime value: 'aa'
 DROP TABLE t1;
 DROP VIEW v1;
 #
diff --git a/mysql-test/main/str_to_datetime_457.result b/mysql-test/main/str_to_datetime_457.result
index 41a8ee9bf90..a024b30944c 100644
--- a/mysql-test/main/str_to_datetime_457.result
+++ b/mysql-test/main/str_to_datetime_457.result
@@ -19,8 +19,8 @@ select extract(hour from '100000:02:03'), extract(hour from '100000:02:03 ');
 extract(hour from '100000:02:03')	extract(hour from '100000:02:03 ')
 NULL	NULL
 Warnings:
-Warning	1292	Truncated incorrect time value: '100000:02:03'
-Warning	1292	Truncated incorrect time value: '100000:02:03 '
+Warning	1292	Incorrect time value: '100000:02:03'
+Warning	1292	Incorrect time value: '100000:02:03 '
 #
 # backward compatibility craziness
 #
diff --git a/mysql-test/main/type_date.result b/mysql-test/main/type_date.result
index 950672161fd..2c268cfdd88 100644
--- a/mysql-test/main/type_date.result
+++ b/mysql-test/main/type_date.result
@@ -621,7 +621,7 @@ SELECT * FROM t1 WHERE LENGTH(a)=11+RAND() AND a=' garbage ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
-Warning	1292	Incorrect datetime value: ' garbage '
+Warning	1292	Truncated incorrect datetime value: ' garbage '
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = DATE'0000-00-00' and <cache>(octet_length(DATE'0000-00-00')) = 11 + rand()
 DROP TABLE t1;
 CREATE TABLE t1 (a DATE);
@@ -970,7 +970,7 @@ SELECT CAST(20061108.01 AS DATE);
 CAST(20061108.01 AS DATE)
 2006-11-08
 Warnings:
-Note	1292	Truncated incorrect datetime value: '20061108.01'
+Note	1292	Truncated incorrect date value: '20061108.01'
 INSERT INTO t1 VALUES (20061108.01);
 Warnings:
 Note	1265	Data truncated for column 'a' at row 1
@@ -980,7 +980,7 @@ SELECT CAST(20061108.01 AS DATE);
 CAST(20061108.01 AS DATE)
 2006-11-08
 Warnings:
-Note	1292	Truncated incorrect datetime value: '20061108.01'
+Note	1292	Truncated incorrect date value: '20061108.01'
 CREATE TABLE t1 (a DATE);
 INSERT INTO t1 VALUES (20061108.01);
 Warnings:
diff --git a/mysql-test/main/type_datetime.result b/mysql-test/main/type_datetime.result
index f75b8d84f48..7a213842e03 100644
--- a/mysql-test/main/type_datetime.result
+++ b/mysql-test/main/type_datetime.result
@@ -399,7 +399,7 @@ if(@bug28261 = f1, '', @bug28261:= f1)
 2001-01-01
 2002-02-02
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 select if(@bug28261 = f1, '', @bug28261:= f1) from t1;
 if(@bug28261 = f1, '', @bug28261:= f1)
 2001-01-01
@@ -423,11 +423,11 @@ f1
 2001-01-01 00:00:00
 2002-02-02 00:00:00
 Warnings:
-Warning	1292	Incorrect datetime value: '2002010'
+Warning	1292	Truncated incorrect datetime value: '2002010'
 select * from t1 where f1 between 20020101 and 2007010100000;
 f1
 Warnings:
-Warning	1292	Incorrect datetime value: '2007010100000'
+Warning	1292	Truncated incorrect datetime value: '2007010100000'
 drop table t1;
 #
 # Bug#27216: functions with parameters of different date types may
@@ -498,7 +498,7 @@ f1
 45:44:44
 15:44:44
 Warnings:
-Warning	1292	Incorrect datetime value: '1'
+Warning	1292	Truncated incorrect datetime value: '1'
 drop table t1;
 create table t1 (a tinyint);
 insert into t1 values (), (), ();
@@ -575,18 +575,18 @@ CAST('NULL' AS DATE) < CAST('NULL' AS DATE) n9;
 n1	n2	n3	n4	n5	n6	n7	n8	n9
 0	0	1	1	1	0	1	0	0
 Warnings:
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
-Warning	1292	Incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
+Warning	1292	Truncated incorrect datetime value: 'NULL'
 End of 5.0 tests
 set @org_mode=@@sql_mode;
 create table t1 (da date default '1962-03-03 23:33:34', dt datetime default '1962-03-03');
@@ -1012,7 +1012,7 @@ SELECT * FROM t1 WHERE LENGTH(a)=30+RAND() AND a=' garbage ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
-Warning	1292	Incorrect datetime value: ' garbage '
+Warning	1292	Truncated incorrect datetime value: ' garbage '
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = TIMESTAMP'0000-00-00 00:00:00' and <cache>(octet_length(TIMESTAMP'0000-00-00 00:00:00')) = 30 + rand()
 DROP TABLE t1;
 CREATE TABLE t1 (a DATETIME);;
@@ -1131,11 +1131,11 @@ INSERT INTO t1 VALUES ('00:00:00'),('00:01:00');
 SELECT 1 FROM t1 WHERE 2016 > SOME (SELECT CAST(a AS DATETIME) FROM t1);
 1
 Warnings:
-Warning	1292	Incorrect datetime value: '2016'
+Warning	1292	Truncated incorrect datetime value: '2016'
 SELECT * FROM t1 WHERE 2016 > CAST(a AS DATETIME);
 a
 Warnings:
-Warning	1292	Incorrect datetime value: '2016'
+Warning	1292	Truncated incorrect datetime value: '2016'
 SELECT 1 FROM t1 WHERE 20160101 > SOME (SELECT CAST(a AS DATETIME) FROM t1);
 1
 1
@@ -1411,5 +1411,28 @@ CREATE TABLE t1 (a DATETIME);
 INSERT INTO t1 SELECT CAST(20010101 AS UNSIGNED);
 DROP TABLE t1;
 #
+# MDEV-17563 Different results using table or view when comparing values of time type 
+#
+CREATE TABLE t1 (pk int, x1 datetime, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'2001-01-01 09:16:37','');
+INSERT INTO t1 VALUES (18,'2001-01-01 09:16:37','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+pk
+17
+18
+Warnings:
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: 'k'
+SELECT pk FROM v1 WHERE x1 >x2;
+pk
+17
+18
+Warnings:
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: 'k'
+DROP VIEW v1;
+DROP TABLE t1;
+#
 # End of 10.4 tests
 #
diff --git a/mysql-test/main/type_datetime.test b/mysql-test/main/type_datetime.test
index 79f2a95b147..7bd7883f469 100644
--- a/mysql-test/main/type_datetime.test
+++ b/mysql-test/main/type_datetime.test
@@ -914,5 +914,19 @@ DROP TABLE t1;
 
 
 --echo #
+--echo # MDEV-17563 Different results using table or view when comparing values of time type 
+--echo #
+
+CREATE TABLE t1 (pk int, x1 datetime, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'2001-01-01 09:16:37','');
+INSERT INTO t1 VALUES (18,'2001-01-01 09:16:37','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+SELECT pk FROM v1 WHERE x1 >x2;
+DROP VIEW v1;
+DROP TABLE t1;
+
+
+--echo #
 --echo # End of 10.4 tests
 --echo #
diff --git a/mysql-test/main/type_temporal_innodb.result b/mysql-test/main/type_temporal_innodb.result
index b869822722d..f8d8bc018bd 100644
--- a/mysql-test/main/type_temporal_innodb.result
+++ b/mysql-test/main/type_temporal_innodb.result
@@ -56,7 +56,7 @@ SELECT DATE'0000-00-00'='';
 DATE'0000-00-00'=''
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 CREATE TABLE t1 (a ENUM('a'), b DATE, c INT, KEY(b)) ENGINE=InnoDB;
 INSERT IGNORE INTO t1 VALUES ('','0000-00-00',0);
 Warnings:
@@ -65,49 +65,49 @@ SELECT * FROM t1 WHERE b='';
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 IGNORE KEY (b) WHERE b='';
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 WHERE a=b;
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT 1 FROM t1 WHERE (SELECT a FROM t1 group by c) = b;
 1
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 ALTER TABLE t1 ENGINE=MyISAM;
 SELECT * FROM t1 WHERE b='';
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 IGNORE KEY (b) WHERE b='';
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 WHERE a=b;
 a	b	c
 	0000-00-00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT 1 FROM t1 WHERE (SELECT a FROM t1 group by c) = b;
 1
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 DROP TABLE t1;
 SELECT TIMESTAMP'0000-00-00 00:00:00'='';
 TIMESTAMP'0000-00-00 00:00:00'=''
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 CREATE TABLE t1 (a ENUM('a'), b DATETIME, c INT, KEY(b)) ENGINE=InnoDB;
 INSERT IGNORE INTO t1 VALUES ('','0000-00-00 00:00:00',0);
 Warnings:
@@ -116,43 +116,43 @@ SELECT * FROM t1 WHERE b='';
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 IGNORE KEY (b) WHERE b='';
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 WHERE a=b;
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT 1 FROM t1 WHERE (SELECT a FROM t1 group by c) = b;
 1
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 ALTER TABLE t1 ENGINE=MyISAM;
 SELECT * FROM t1 WHERE b='';
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 IGNORE KEY (b) WHERE b='';
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT * FROM t1 WHERE a=b;
 a	b	c
 	0000-00-00 00:00:00	0
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 SELECT 1 FROM t1 WHERE (SELECT a FROM t1 group by c) = b;
 1
 1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 DROP TABLE t1;
 CREATE TABLE t1 (d DATE) ENGINE=InnoDB;
 INSERT INTO t1 VALUES ('2012-12-21');
diff --git a/mysql-test/main/type_time.result b/mysql-test/main/type_time.result
index e530298db23..0a66a94db69 100644
--- a/mysql-test/main/type_time.result
+++ b/mysql-test/main/type_time.result
@@ -2103,8 +2103,8 @@ TIME(0)=TIME('z') AS t;
 ts	d	t
 1	1	1
 Warnings:
-Warning	1292	Incorrect datetime value: 'z'
-Warning	1292	Incorrect datetime value: 'z'
+Warning	1292	Truncated incorrect datetime value: 'z'
+Warning	1292	Truncated incorrect datetime value: 'z'
 Warning	1292	Truncated incorrect time value: 'z'
 SELECT
 TIMESTAMP(0)=TIMESTAMP('') AS ts,
@@ -2113,9 +2113,60 @@ TIME(0)=TIME('') AS t;
 ts	d	t
 1	1	1
 Warnings:
-Warning	1292	Incorrect datetime value: ''
-Warning	1292	Incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
+Warning	1292	Truncated incorrect datetime value: ''
 Warning	1292	Truncated incorrect time value: ''
 #
+# MDEV-17563 Different results using table or view when comparing values of time type
+#
+CREATE TABLE t1 (pk int, x1 time, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'09:16:37','k'),(70,'19:44:22','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+pk
+17
+70
+Warnings:
+Warning	1292	Truncated incorrect time value: 'k'
+Warning	1292	Truncated incorrect time value: 'k'
+SELECT pk FROM v1 WHERE x1 >x2;
+pk
+17
+70
+Warnings:
+Warning	1292	Truncated incorrect time value: 'k'
+Warning	1292	Truncated incorrect time value: 'k'
+DROP VIEW v1;
+DROP TABLE t1;
+CREATE TABLE t1 (pk int, x1 time, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'09:16:37',''),(70,'19:44:22','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+pk
+17
+70
+Warnings:
+Warning	1292	Truncated incorrect time value: ''
+Warning	1292	Truncated incorrect time value: 'k'
+SELECT pk FROM v1 WHERE x1 >x2;
+pk
+17
+70
+Warnings:
+Warning	1292	Truncated incorrect time value: ''
+Warning	1292	Truncated incorrect time value: 'k'
+DROP VIEW IF EXISTS v1;
+DROP TABLE IF EXISTS t1;
+#
+# MDEV-17625 Different warnings when comparing a garbage to DATETIME vs TIME
+#
+SELECT TIMESTAMP(0)='z', DATE(0)='z', TIME(0)='z';
+TIMESTAMP(0)='z'	DATE(0)='z'	TIME(0)='z'
+1	1	1
+Warnings:
+Warning	1292	Truncated incorrect datetime value: 'z'
+Warning	1292	Truncated incorrect datetime value: 'z'
+Warning	1292	Truncated incorrect time value: 'z'
+#
 # End of 10.4 tests
 #
diff --git a/mysql-test/main/type_time.test b/mysql-test/main/type_time.test
index 1fe3d8ab0ee..5e4090f48a4 100644
--- a/mysql-test/main/type_time.test
+++ b/mysql-test/main/type_time.test
@@ -1379,6 +1379,36 @@ SELECT
   DATE(0)=DATE('') AS d,
   TIME(0)=TIME('') AS t;
 
+
+--echo #
+--echo # MDEV-17563 Different results using table or view when comparing values of time type
+--echo #
+
+CREATE TABLE t1 (pk int, x1 time, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'09:16:37','k'),(70,'19:44:22','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+SELECT pk FROM v1 WHERE x1 >x2;
+DROP VIEW v1;
+DROP TABLE t1;
+
+
+CREATE TABLE t1 (pk int, x1 time, x2 varchar(1));
+INSERT INTO t1 VALUES (17,'09:16:37',''),(70,'19:44:22','k');
+CREATE VIEW v1 AS SELECT * FROM t1;
+SELECT pk FROM t1 WHERE x1 >x2;
+SELECT pk FROM v1 WHERE x1 >x2;
+DROP VIEW IF EXISTS v1;
+DROP TABLE IF EXISTS t1;
+
+
+--echo #
+--echo # MDEV-17625 Different warnings when comparing a garbage to DATETIME vs TIME
+--echo #
+
+SELECT TIMESTAMP(0)='z', DATE(0)='z', TIME(0)='z';
+
+
 --echo #
 --echo # End of 10.4 tests
 --echo #
diff --git a/mysql-test/main/type_timestamp.result b/mysql-test/main/type_timestamp.result
index 071b2181e73..a708ef5ec34 100644
--- a/mysql-test/main/type_timestamp.result
+++ b/mysql-test/main/type_timestamp.result
@@ -872,7 +872,7 @@ SELECT * FROM t1 WHERE LENGTH(a)=30+RAND() AND a=' garbage ';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	100.00	Using where
 Warnings:
-Warning	1292	Incorrect datetime value: ' garbage '
+Warning	1292	Truncated incorrect datetime value: ' garbage '
 Note	1003	select `test`.`t1`.`a` AS `a` from `test`.`t1` where `test`.`t1`.`a` = TIMESTAMP'0000-00-00 00:00:00' and <cache>(octet_length(TIMESTAMP'0000-00-00 00:00:00')) = 30 + rand()
 DROP TABLE t1;
 CREATE TABLE t1 (a TIMESTAMP);;