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 b19252e4dd7..e788dfd9fc1 100644
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result
@@ -910,13 +910,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t
 WHERE select_id = 151 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -925,13 +925,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 151 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -1354,8 +1354,8 @@ my_double, id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -1366,8 +1366,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -1682,8 +1682,8 @@ WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
@@ -1696,8 +1696,8 @@ WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 DROP VIEW v1;
@@ -2014,8 +2014,8 @@ my_double, id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 SHOW CREATE VIEW v1;
@@ -2026,8 +2026,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 DROP VIEW v1;
@@ -2562,13 +2562,13 @@ my_double, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2577,13 +2577,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -2930,13 +2930,13 @@ my_double, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2945,13 +2945,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL) order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -3288,8 +3288,8 @@ my_double, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3306,8 +3306,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL) order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3680,14 +3680,14 @@ my_double, id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 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
@@ -3696,14 +3696,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL) order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -4042,14 +4042,14 @@ my_double, id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4061,14 +4061,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4416,14 +4416,14 @@ my_double, id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
@@ -4434,14 +4434,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
@@ -4776,8 +4776,8 @@ my_double, id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -4788,8 +4788,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -5088,8 +5088,8 @@ my_double, id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -5100,8 +5100,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result
index 9511aa973e5..b4bce0b0d1b 100644
--- a/mysql-test/suite/funcs_1/r/innodb_views.result
+++ b/mysql-test/suite/funcs_1/r/innodb_views.result
@@ -22824,7 +22824,7 @@ f1	f2
 ABC	3
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
+ABC	1.7320508075688772
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
@@ -22842,7 +22842,7 @@ ABC	DEF
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22865,7 +22865,7 @@ my_sqrt	double	YES		NULL
 SELECT * FROM v2 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 Warnings:
@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 Warnings:
@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
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 eb3d326808f..3b1f1b03728 100644
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result
@@ -911,13 +911,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t
 WHERE select_id = 151 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -926,13 +926,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 151 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -1355,8 +1355,8 @@ my_double, id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -1367,8 +1367,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -1683,8 +1683,8 @@ WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
@@ -1697,8 +1697,8 @@ WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 DROP VIEW v1;
@@ -2015,8 +2015,8 @@ my_double, id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 SHOW CREATE VIEW v1;
@@ -2027,8 +2027,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 DROP VIEW v1;
@@ -2563,13 +2563,13 @@ my_double, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2578,13 +2578,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -2931,13 +2931,13 @@ my_double, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2946,13 +2946,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL) order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -3289,8 +3289,8 @@ my_double, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3307,8 +3307,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL) order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3681,14 +3681,14 @@ my_double, id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 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
@@ -3697,14 +3697,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL) order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -4043,14 +4043,14 @@ my_double, id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4062,14 +4062,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4417,14 +4417,14 @@ my_double, id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
@@ -4435,14 +4435,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
@@ -4777,8 +4777,8 @@ my_double, id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -4789,8 +4789,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -5089,8 +5089,8 @@ my_double, id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -5101,8 +5101,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/memory_views.result b/mysql-test/suite/funcs_1/r/memory_views.result
index 7f3a0efb8b8..2f7342088f8 100644
--- a/mysql-test/suite/funcs_1/r/memory_views.result
+++ b/mysql-test/suite/funcs_1/r/memory_views.result
@@ -22826,7 +22826,7 @@ f1	f2
 ABC	3
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
+ABC	1.7320508075688772
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
@@ -22844,7 +22844,7 @@ ABC	DEF
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22867,7 +22867,7 @@ my_sqrt	double	YES		NULL
 SELECT * FROM v2 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22878,7 +22878,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 Warnings:
@@ -22887,7 +22887,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 Warnings:
@@ -22896,7 +22896,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t1;
 DROP TABLE t2;
 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 eb3d326808f..3b1f1b03728 100644
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result
@@ -911,13 +911,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t
 WHERE select_id = 151 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -926,13 +926,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 151 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -1355,8 +1355,8 @@ my_double, id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -1367,8 +1367,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -1683,8 +1683,8 @@ WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
@@ -1697,8 +1697,8 @@ WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 DROP VIEW v1;
@@ -2015,8 +2015,8 @@ my_double, id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 SHOW CREATE VIEW v1;
@@ -2027,8 +2027,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 DROP VIEW v1;
@@ -2563,13 +2563,13 @@ my_double, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2578,13 +2578,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -2931,13 +2931,13 @@ my_double, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2946,13 +2946,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL) order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -3289,8 +3289,8 @@ my_double, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3307,8 +3307,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL) order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3681,14 +3681,14 @@ my_double, id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 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
@@ -3697,14 +3697,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL) order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -4043,14 +4043,14 @@ my_double, id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4062,14 +4062,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4417,14 +4417,14 @@ my_double, id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
@@ -4435,14 +4435,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
@@ -4777,8 +4777,8 @@ my_double, id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -4789,8 +4789,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -5089,8 +5089,8 @@ my_double, id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -5101,8 +5101,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/myisam_views.result b/mysql-test/suite/funcs_1/r/myisam_views.result
index 65ad319d642..b77ea8a4bd9 100644
--- a/mysql-test/suite/funcs_1/r/myisam_views.result
+++ b/mysql-test/suite/funcs_1/r/myisam_views.result
@@ -24528,7 +24528,7 @@ f1	f2
 ABC	3
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
+ABC	1.7320508075688772
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
@@ -24546,7 +24546,7 @@ ABC	DEF
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -24569,7 +24569,7 @@ my_sqrt	double	YES		NULL
 SELECT * FROM v2 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -24580,7 +24580,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 Warnings:
@@ -24589,7 +24589,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 Warnings:
@@ -24598,7 +24598,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/ndb_func_view.result b/mysql-test/suite/funcs_1/r/ndb_func_view.result
index b19252e4dd7..e788dfd9fc1 100644
--- a/mysql-test/suite/funcs_1/r/ndb_func_view.result
+++ b/mysql-test/suite/funcs_1/r/ndb_func_view.result
@@ -910,13 +910,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double), my_double, id FROM t
 WHERE select_id = 151 OR select_id IS NULL order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 left('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö',`t1_values`.`my_double`) AS `LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -925,13 +925,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 151 OR select_id IS NULL) order by id;
 LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜüÖö', my_double)	my_double	id
 NULL	NULL	1
-	-1.7976931348623e+308	2
-AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e+308	3
+	-1.7976931348623e308	2
+AaBbCcDdEeFfGgHhIiJjÄäÜüÖö	1.7976931348623e308	3
 	0	4
 	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -1354,8 +1354,8 @@ my_double, id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -1366,8 +1366,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 133 OR select_id IS NULL) order by id;
 IFNULL(my_double,'IS_NULL')	my_double	id
 IS_NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -1682,8 +1682,8 @@ WHERE select_id = 121 OR select_id IS NULL order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 SHOW CREATE VIEW v1;
@@ -1696,8 +1696,8 @@ WHERE select_id = 121 OR select_id IS NULL) order by id;
 IF(my_double IS NULL, 'IS     NULL',
 'IS NOT NULL')	my_double	id
 IS     NULL	NULL	1
-IS NOT NULL	-1.7976931348623e+308	2
-IS NOT NULL	1.7976931348623e+308	3
+IS NOT NULL	-1.7976931348623e308	2
+IS NOT NULL	1.7976931348623e308	3
 IS NOT NULL	0	4
 IS NOT NULL	-1	5
 DROP VIEW v1;
@@ -2014,8 +2014,8 @@ my_double, id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 SHOW CREATE VIEW v1;
@@ -2026,8 +2026,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 109 OR select_id IS NULL) order by id;
 IF(my_double, 'IS     TRUE', 'IS NOT TRUE')	my_double	id
 IS NOT TRUE	NULL	1
-IS     TRUE	-1.7976931348623e+308	2
-IS     TRUE	1.7976931348623e+308	3
+IS     TRUE	-1.7976931348623e308	2
+IS     TRUE	1.7976931348623e308	3
 IS NOT TRUE	0	4
 IS     TRUE	-1	5
 DROP VIEW v1;
@@ -2562,13 +2562,13 @@ my_double, id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 unsigned) AS `CAST(my_double AS UNSIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2577,13 +2577,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 89 OR select_id IS NULL) order by id;
 CAST(my_double AS UNSIGNED INTEGER)	my_double	id
 NULL	NULL	1
-9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 18446744073709551615	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -2930,13 +2930,13 @@ my_double, id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 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 signed) AS `CAST(my_double AS SIGNED INTEGER)`,`t1_values`.`my_double` AS `my_double`,`t1_values`.`id` AS `id` from `t1_values`	latin1	latin1_swedish_ci
@@ -2945,13 +2945,13 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 77 OR select_id IS NULL) order by id;
 CAST(my_double AS SIGNED INTEGER)	my_double	id
 NULL	NULL	1
--9223372036854775808	-1.7976931348623e+308	2
-9223372036854775807	1.7976931348623e+308	3
+-9223372036854775808	-1.7976931348623e308	2
+9223372036854775807	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 Warnings:
-Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e+308'
-Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e+308'
+Warning	1292	Truncated incorrect INTEGER value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect INTEGER value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -3288,8 +3288,8 @@ my_double, id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3306,8 +3306,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 65 OR select_id IS NULL) order by id;
 CAST(my_double AS DECIMAL(37,2))	my_double	id
 NULL	NULL	1
--99999999999999999999999999999999999.99	-1.7976931348623e+308	2
-99999999999999999999999999999999999.99	1.7976931348623e+308	3
+-99999999999999999999999999999999999.99	-1.7976931348623e308	2
+99999999999999999999999999999999999.99	1.7976931348623e308	3
 0.00	0	4
 -1.00	-1	5
 -3333.33	-3333.3333	30
@@ -3680,14 +3680,14 @@ my_double, id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 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
@@ -3696,14 +3696,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 53 OR select_id IS NULL) order by id;
 CAST(my_double AS TIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 00:00:00	0	4
 -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	Truncated incorrect time value: '-1.7976931348623e308'
+Warning	1292	Truncated incorrect time value: '1.7976931348623e308'
 DROP VIEW v1;
 
 
@@ -4042,14 +4042,14 @@ my_double, id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4061,14 +4061,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 42 OR select_id IS NULL) order by id;
 CAST(my_double AS DATETIME)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 Warning	1292	Incorrect datetime value: '200506271758'
@@ -4416,14 +4416,14 @@ my_double, id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 SHOW CREATE VIEW v1;
@@ -4434,14 +4434,14 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 31 OR select_id IS NULL) order by id;
 CAST(my_double AS DATE)	my_double	id
 NULL	NULL	1
-NULL	-1.7976931348623e+308	2
-NULL	1.7976931348623e+308	3
+NULL	-1.7976931348623e308	2
+NULL	1.7976931348623e308	3
 NULL	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: '-1.7976931348623e308'
+Warning	1292	Incorrect datetime value: '1.7976931348623e308'
 Warning	1292	Incorrect datetime value: '0'
 Warning	1292	Incorrect datetime value: '-1'
 DROP VIEW v1;
@@ -4776,8 +4776,8 @@ my_double, id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -4788,8 +4788,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 20 OR select_id IS NULL) order by id;
 CAST(my_double AS CHAR)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
@@ -5088,8 +5088,8 @@ my_double, id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 SHOW CREATE VIEW v1;
@@ -5100,8 +5100,8 @@ WHERE v1.id IN (SELECT id FROM t1_values
 WHERE select_id = 8 OR select_id IS NULL) order by id;
 CAST(my_double AS BINARY)	my_double	id
 NULL	NULL	1
--1.7976931348623e+308	-1.7976931348623e+308	2
-1.7976931348623e+308	1.7976931348623e+308	3
+-1.7976931348623e308	-1.7976931348623e308	2
+1.7976931348623e308	1.7976931348623e308	3
 0	0	4
 -1	-1	5
 DROP VIEW v1;
diff --git a/mysql-test/suite/funcs_1/r/ndb_views.result b/mysql-test/suite/funcs_1/r/ndb_views.result
index 79020adbc50..10cb7613f47 100644
--- a/mysql-test/suite/funcs_1/r/ndb_views.result
+++ b/mysql-test/suite/funcs_1/r/ndb_views.result
@@ -22824,7 +22824,7 @@ f1	f2
 ABC	3
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
-ABC	1.73205080756888
+ABC	1.7320508075688772
 ALTER TABLE t1 CHANGE COLUMN f2 f2 VARCHAR(30);
 INSERT INTO t1   SET f1 = 'ABC', f2 = 'DEF';
 DESCRIBE t1;
@@ -22842,7 +22842,7 @@ ABC	DEF
 SELECT * FROM v1 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22865,7 +22865,7 @@ my_sqrt	double	YES		NULL
 SELECT * FROM v2 order by 2;
 f1	my_sqrt
 ABC	0
-ABC	1.73205080756888
+ABC	1.7320508075688772
 Warnings:
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
 Warning	1292	Truncated incorrect DOUBLE value: 'DEF'
@@ -22876,7 +22876,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v1;
 Warnings:
@@ -22885,7 +22885,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t2;
 CREATE TABLE t2 AS SELECT * FROM v2;
 Warnings:
@@ -22894,7 +22894,7 @@ SELECT * FROM t2 order by 2;
 f1	ABC
 my_sqrt	0
 f1	ABC
-my_sqrt	1.73205080756888
+my_sqrt	1.7320508075688772
 DROP TABLE t1;
 DROP TABLE t2;
 DROP VIEW  v1;
diff --git a/mysql-test/suite/funcs_1/r/storedproc.result b/mysql-test/suite/funcs_1/r/storedproc.result
index cda55e92ac8..f08c52322f3 100644
--- a/mysql-test/suite/funcs_1/r/storedproc.result
+++ b/mysql-test/suite/funcs_1/r/storedproc.result
@@ -182,12 +182,9 @@ db_storedproc	func_1	FUNCTION	root@localhost	<modified>	<created>	INVOKER	this i
 UPDATE t1_aux SET f1 = NULL;
 SELECT f1,f1,f1,f1 INTO @v1_tab,@v1_proc,@v2_proc,@v1_func FROM t1_aux;
 UPDATE t1_aux SET f1 = 1.7976931348623157493578e+308;
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
 SELECT f1 INTO @v1_tab FROM t1_aux;
 CALL sproc_1(1.7976931348623157493578e+308, @v1_proc);
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
 SET @v1_func = func_1(1.7976931348623157493578e+308);
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
 UPDATE t1_aux SET f1 = NULL;
 SELECT f1,f1,f1,f1 INTO @v1_tab,@v1_proc,@v2_proc,@v1_func FROM t1_aux;
 UPDATE t1_aux SET f1 = 0.1234567890987654321e+100;
@@ -17092,7 +17089,7 @@ return f1;
 END//
 SELECT fn77(1.1);
 fn77(1.1)
-1.1
+1.0999999999999996
 DROP FUNCTION IF EXISTS fn78;
 CREATE FUNCTION fn78( f1 real unsigned) returns real unsigned
 BEGIN
@@ -18256,7 +18253,7 @@ SELECT f1;
 END//
 CALL sp77(1.1);
 f1
-1.1
+1.0999999999999996
 DROP PROCEDURE IF EXISTS sp78;
 CREATE PROCEDURE sp78( f1 real unsigned)
 BEGIN
@@ -19457,9 +19454,9 @@ SELECT var1, var2, var3, var4, var5, var6, var7, var8;
 END//
 CALL spexecute24();
 f1	f2	f3	f4	f5	f6	f7	f8	f9	f10	f11	f12
-1.1	1.1	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
+1.0999999999999996	1.0999999999999996	11.1	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616	-9220000000000000000	6744073709551616	6744073709551616
 var1	var2	var3	var4	var5	var6	var7	var8
-1.1	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
+1.0999999999999996	11.1	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616	6744073709551616
 DROP PROCEDURE spexecute24;
 DROP PROCEDURE sp24;
 DROP PROCEDURE IF EXISTS sp25;