various fixes for buildbot failures

1 files changed, 48 insertions, 74 deletions

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 bcef7bae827..61b375fbc1e 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -3541,10 +3541,10 @@ my_year, id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
-00:19:01	1901	2
-00:21:55	2155	3
-00:20:00	2000	4
-00:20:05	2005	5
+00:00:00	1901	2
+00:00:00	2155	3
+00:00:00	2000	4
+00:00:00	2005	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_year` as time) AS `CAST(my_year AS TIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3553,10 +3553,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 58 OR select_id IS NULL) order by id;
 CAST(my_year AS TIME)	my_year	id
 NULL	NULL	1
-00:19:01	1901	2
-00:21:55	2155	3
-00:20:00	2000	4
-00:20:05	2005	5
+00:00:00	1901	2
+00:00:00	2155	3
+00:00:00	2000	4
+00:00:00	2005	5
 DROP VIEW v1;
 
 
@@ -3677,8 +3677,8 @@ NULL	1.7976931348623e+308	3
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' for column '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
@@ -3693,8 +3693,8 @@ NULL	1.7976931348623e+308	3
 -00:00:01	-1	5
 00:17:58	1758	25
 Warnings:
-Warning	1292	Truncated incorrect time value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect time value: '1.7976931348623e+308'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' for column 'my_double' at row 1
 DROP VIEW v1;
 
 
@@ -3887,15 +3887,10 @@ my_year, id FROM t1_values
 WHERE select_id = 47 OR select_id IS NULL order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
-NULL	1901	2
-NULL	2155	3
-NULL	2000	4
-NULL	2005	5
-Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+1901-00-00 00:00:00	1901	2
+2155-00-00 00:00:00	2155	3
+2000-00-00 00:00:00	2000	4
+2005-00-00 00:00:00	2005	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_year` as datetime) AS `CAST(my_year AS DATETIME)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3904,15 +3899,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 47 OR select_id IS NULL) order by id;
 CAST(my_year AS DATETIME)	my_year	id
 NULL	NULL	1
-NULL	1901	2
-NULL	2155	3
-NULL	2000	4
-NULL	2005	5
-Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+1901-00-00 00:00:00	1901	2
+2155-00-00 00:00:00	2155	3
+2000-00-00 00:00:00	2000	4
+2005-00-00 00:00:00	2005	5
 DROP VIEW v1;
 
 
@@ -3924,12 +3914,11 @@ WHERE select_id = 46 OR select_id IS NULL order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 NULL	-838:59:59	2
-NULL	838:59:59	3
+0000-01-03 22:59:59	838:59:59	3
 0000-00-00 13:00:00	13:00:00	4
 0000-00-00 10:00:00	10:00:00	5
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '-838:59:59'
-Warning	1292	Truncated incorrect datetime value: '838:59:59'
 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_time` as datetime) AS `CAST(my_time AS DATETIME)`,`t1_values`.`my_time` AS `my_time`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -3939,12 +3928,11 @@ WHERE select_id = 46 OR select_id IS NULL) order by id;
 CAST(my_time AS DATETIME)	my_time	id
 NULL	NULL	1
 NULL	-838:59:59	2
-NULL	838:59:59	3
+0000-01-03 22:59:59	838:59:59	3
 0000-00-00 13:00:00	13:00:00	4
 0000-00-00 10:00:00	10:00:00	5
 Warnings:
 Warning	1292	Truncated incorrect datetime value: '-838:59:59'
-Warning	1292	Truncated incorrect datetime value: '838:59:59'
 DROP VIEW v1;
 
 
@@ -4035,15 +4023,14 @@ CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
 NULL	1.7976931348623e+308	3
-NULL	0	4
+0000-00-00 00:00:00	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' 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
 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
@@ -4054,15 +4041,14 @@ CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
 NULL	1.7976931348623e+308	3
-NULL	0	4
+0000-00-00 00:00:00	0	4
 NULL	-1	5
 NULL	200506271758	19
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
-Warning	1292	Incorrect datetime value: '200506271758'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' 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
 DROP VIEW v1;
 
 
@@ -4267,15 +4253,10 @@ my_year, id FROM t1_values
 WHERE select_id = 36 OR select_id IS NULL order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
-NULL	1901	2
-NULL	2155	3
-NULL	2000	4
-NULL	2005	5
-Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+1901-00-00	1901	2
+2155-00-00	2155	3
+2000-00-00	2000	4
+2005-00-00	2005	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_year` as date) AS `CAST(my_year AS DATE)`,`t1_values`.`my_year` AS `my_year`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -4284,15 +4265,10 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 36 OR select_id IS NULL) order by id;
 CAST(my_year AS DATE)	my_year	id
 NULL	NULL	1
-NULL	1901	2
-NULL	2155	3
-NULL	2000	4
-NULL	2005	5
-Warnings:
-Warning	1292	Incorrect datetime value: '1901'
-Warning	1292	Incorrect datetime value: '2155'
-Warning	1292	Incorrect datetime value: '2000'
-Warning	1292	Incorrect datetime value: '2005'
+1901-00-00	1901	2
+2155-00-00	2155	3
+2000-00-00	2000	4
+2005-00-00	2005	5
 DROP VIEW v1;
 
 
@@ -4409,14 +4385,13 @@ CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
 NULL	1.7976931348623e+308	3
-NULL	0	4
+0000-00-00	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 2
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' for column 'my_double' at row 3
+Warning	1292	Incorrect datetime value: '-1' for column '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
@@ -4427,14 +4402,13 @@ CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
 NULL	-1.7976931348623e+308	2
 NULL	1.7976931348623e+308	3
-NULL	0	4
+0000-00-00	0	4
 NULL	-1	5
 2005-06-27	20050627	13
 Warnings:
-Warning	1292	Incorrect datetime value: '-1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '1.7976931348623e+308'
-Warning	1292	Incorrect datetime value: '0'
-Warning	1292	Incorrect datetime value: '-1'
+Warning	1292	Incorrect datetime value: '-1.7976931348623e+308' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '1.7976931348623e+308' for column 'my_double' at row 1
+Warning	1292	Incorrect datetime value: '-1' for column 'my_double' at row 1
 DROP VIEW v1;