Merge 10.3 into 10.4

5 files changed, 113 insertions, 113 deletions

diff --git a/mysql-test/suite/funcs_1/r/innodb_func_view.result b/mysql-test/suite/funcs_1/r/innodb_func_view.result
index 45c04e32de8..7850e017fb2 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -3715,8 +3715,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3731,8 +3731,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -3749,8 +3749,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3765,8 +3765,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4061,10 +4061,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 19
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 19
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4079,10 +4079,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4099,10 +4099,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 18
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 18
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4117,10 +4117,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4421,9 +4421,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4438,9 +4438,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4457,9 +4457,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4474,9 +4474,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
diff --git a/mysql-test/suite/funcs_1/r/is_columns_innodb.result b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
index 8f2ba33b591..fbca906a9fb 100644
--- a/mysql-test/suite/funcs_1/r/is_columns_innodb.result
+++ b/mysql-test/suite/funcs_1/r/is_columns_innodb.result
@@ -359,9 +359,9 @@ drop TABLE if exists t7, t8;
 CREATE TABLE t7 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
 CREATE TABLE t8 (f1 char(20),f2 char(25),f3 date,f4 int) ENGINE = InnoDB;
 LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' INTO TABLE t7;
-ERROR 22007: Incorrect date value: '' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '' for column `test`.`t7`.`f3` at row 1
 LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t7.txt' INTO TABLE t8;
-ERROR 22007: Incorrect date value: '' for column 'f3' at row 1
+ERROR 22007: Incorrect date value: '' for column `test`.`t8`.`f3` at row 1
 drop TABLE if exists t9;
 CREATE TABLE t9 (f1 int, f2 char(25), f3 int) ENGINE = InnoDB;
 LOAD DATA INFILE '<MYSQLTEST_VARDIR>/std_data/funcs_1/t9.txt' INTO TABLE t9;
diff --git a/mysql-test/suite/funcs_1/r/memory_func_view.result b/mysql-test/suite/funcs_1/r/memory_func_view.result
index 62c9a245010..88bfa702be8 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -3716,8 +3716,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3732,8 +3732,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -3750,8 +3750,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3766,8 +3766,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4062,10 +4062,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 6
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 6
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4080,10 +4080,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4100,10 +4100,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 6
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 6
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4118,10 +4118,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4422,9 +4422,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4439,9 +4439,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4458,9 +4458,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4475,9 +4475,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
diff --git a/mysql-test/suite/funcs_1/r/myisam_func_view.result b/mysql-test/suite/funcs_1/r/myisam_func_view.result
index 62c9a245010..88bfa702be8 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -3716,8 +3716,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 3
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as time) AS `CAST(my_double AS TIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3732,8 +3732,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Incorrect time value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect time value: '1.7976931348623e308' for column 'my_double' at row 1
+Warning	1292	Incorrect time value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect time value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -3750,8 +3750,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 3
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as time) AS `CAST(my_bigint AS TIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3766,8 +3766,8 @@ NULL	NULL	1
 -00:00:01	-1	5
 00:17:58	1758	24
 Warnings:
-Warning	1292	Incorrect time value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect time value: '9223372036854775807' for column 'my_bigint' at row 1
+Warning	1292	Incorrect time value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect time value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4062,10 +4062,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 6
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 6
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as datetime) AS `CAST(my_double AS DATETIME)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4080,10 +4080,10 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4100,10 +4100,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 6
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 6
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as datetime) AS `CAST(my_bigint AS DATETIME)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4118,10 +4118,10 @@ NULL	9223372036854775807	3
 NULL	-1	5
 NULL	200506271758	18
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '200506271758' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '200506271758' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
@@ -4422,9 +4422,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 2
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 5
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_double` as date) AS `CAST(my_double AS DATE)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4439,9 +4439,9 @@ NULL	1.7976931348623e308	3
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column 'my_double' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e308' for column `test`.`t1_values`.`my_double` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_double` at row 1
 DROP VIEW v1;
 
 
@@ -4458,9 +4458,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 2
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 3
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 5
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 2
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 3
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 5
 SHOW CREATE VIEW v1;
 View	Create View	character_set_client	collation_connection
 v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select cast(`t1_values`.`my_bigint` as date) AS `CAST(my_bigint AS DATE)`,`t1_values`.`my_bigint` AS `my_bigint`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4475,9 +4475,9 @@ NULL	9223372036854775807	3
 NULL	-1	5
 2005-06-27	20050627	12
 Warnings:
-Warning	1292	Incorrect datetime value: '-9223372036854775808' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '9223372036854775807' for column 'my_bigint' at row 1
-Warning	1292	Incorrect datetime value: '-1' for column 'my_bigint' at row 1
+Warning	1292	Incorrect datetime value: '-9223372036854775808' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '9223372036854775807' for column `test`.`t1_values`.`my_bigint` at row 1
+Warning	1292	Incorrect datetime value: '-1' for column `test`.`t1_values`.`my_bigint` at row 1
 DROP VIEW v1;
 
 
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index 0fe7082bea1..81ed8405b7d 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -13825,7 +13825,7 @@ CALL sp1();
 @xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1366	Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13874,7 +13874,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect double value: 'asd' for column 'xx' at row 1
+Warning	1366	Incorrect double value: 'asd' for column ``.``.`xx` at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -13946,7 +13946,7 @@ CALL sp1();
 xx
 0
 Warnings:
-Warning	1366	Incorrect integer value: 'asd' for column 'xx' at row 1
+Warning	1366	Incorrect integer value: 'asd' for column ``.``.`xx` at row 1
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN