bk commit into 6.0 tree (pcrews:1.2653) BUG#36721

[pcrews]

Below is the list of changes that have just been committed into a local
6.0 repository of pcrews.  When pcrews does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-18 18:32:34-04:00, pcrews@stripped +9 -0
  Bug#36721 - Test funcs_1.<engine>_func_view failing for multiple engines
  Bug#36724 - Test funcs_1.<engine>_storedproc_02 needs to be updated
  Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on 5.1+
  
  Needed to revise my patch from 5.1 to account for addition of falcon engine, as well as
other 5.1 -> 6.0 changes.

  mysql-test/suite/funcs_1/r/falcon_storedproc.result@stripped, 2008-05-18 18:32:22-04:00,
pcrews@stripped [phone]
    Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on
5.1+
    
    Had to re-record the .result file for falcon engine

  mysql-test/suite/funcs_1/r/falcon_storedproc_02.result@stripped, 2008-05-18 18:32:22-04:00,
pcrews@stripped +6 -0
    Bug#36724 - Test funcs_1.<engine>_storedproc_02 needs to be updated.
    
    Recorded .result file for falcon engine for 6.0

  mysql-test/suite/funcs_1/r/innodb_func_view.result@stripped, 2008-05-18 18:32:22-04:00,
pcrews@stripped [phone]
    Bug#36721 - Test funcs_1.<engine>_func_view failing for multiple engines
    
    Re-recorded for 6.0 -- removed + sign from decimal exponent and needed 
    to revise the result set

  mysql-test/suite/funcs_1/r/innodb_storedproc.result@stripped, 2008-05-18 18:32:24-04:00,
pcrews@stripped [phone]
    Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on
5.1+
    
    Re-recorded for 6.0.  Appears to be a difference in precision.

  mysql-test/suite/funcs_1/r/memory_func_view.result@stripped, 2008-05-18 18:32:24-04:00,
pcrews@stripped [phone]
    Bug#36721 - Test funcs_1.<engine>_func_view failing for multiple engines
    
    Re-recorded for 6.0 -- removed + sign from decimal exponent and needed 
    to revise the result set

  mysql-test/suite/funcs_1/r/memory_storedproc.result@stripped, 2008-05-18 18:32:26-04:00,
pcrews@stripped [phone]
    Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on
5.1+
    
    Re-recorded for 6.0.  Appears to be a difference in precision.

  mysql-test/suite/funcs_1/r/myisam_func_view.result@stripped, 2008-05-18 18:32:27-04:00,
pcrews@stripped [phone]
    Bug#36721 - Test funcs_1.<engine>_func_view failing for multiple engines
    
    Re-recorded for 6.0 -- removed + sign from decimal exponent and needed 
    to revise the result set

  mysql-test/suite/funcs_1/r/myisam_storedproc.result@stripped, 2008-05-18 18:32:28-04:00,
pcrews@stripped [phone]
    Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on
5.1+
    
    Re-recorded for 6.0.  Appears to be a difference in precision.

  mysql-test/suite/funcs_1/r/ndb_storedproc.result@stripped, 2008-05-18 18:32:30-04:00,
pcrews@stripped [phone]
    Bug#36726 - Test funcs_1.<engine>_storedproc failing - Needs to be updated on
5.1+
    
    Re-recorded for 6.0.  Appears to be a difference in precision.

diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc.result
b/mysql-test/suite/funcs_1/r/falcon_storedproc.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc.result	2008-04-02 08:25:54 -04:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc.result	2008-05-18 18:32:22 -04:00
@@ -14223,6 +14223,8 @@ ERROR 42000: Bad SQLSTATE: '2005-03-03'
 
 Testcase 4.2.43:
 --------------------------------------------------------------------------------
+testcase: ensure that the declare  condition for statement cannot
+declare a condition for the successful completion sqlstate: 00000.
 DROP PROCEDURE IF EXISTS sp1;
 CREATE PROCEDURE sp1()
 BEGIN
@@ -14232,6 +14234,10 @@ set @x=1;
 SELECT @var2;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
+Verify no illegal sp1 was created
+CALL sp1();
+ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
+DROP PROCEDURE IF EXISTS sp1;
 
 Testcase 4.2.45:
 --------------------------------------------------------------------------------
@@ -14307,6 +14313,10 @@ set @x=1;
 SELECT @var2;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
+CALL sp1();
+ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
+DROP PROCEDURE sp1;
+ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
 
 Testcase 4.2.52:
 --------------------------------------------------------------------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result
--- a/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result	2008-04-02 08:25:54 -04:00
+++ b/mysql-test/suite/funcs_1/r/falcon_storedproc_02.result	2008-05-18 18:32:22 -04:00
@@ -583,6 +583,8 @@ END//
 CALL h1();
 x1	x2	x3	x4	x5	x6
 1	1	1	1	1	1
+Bug#8759-Stored Procedures: SQLSTATE '00000' should be illegal
+We expect this stored procedure to be rejected.
 CREATE PROCEDURE sp1()
 begin1_label:BEGIN
 declare exit handler for sqlstate '00000' set @var1 = 5;
@@ -595,9 +597,13 @@ END begin2_label;
 SELECT @var1, @var2;
 END begin1_label//
 ERROR 42000: Bad SQLSTATE: '00000'
+Verify no illegal sp1 was created
+CALL sp1();
+ERROR 42000: PROCEDURE db_storedproc.sp1 does not exist
 DROP PROCEDURE p1;
 DROP PROCEDURE h1;
 DROP TABLE res_t1;
+DROP PROCEDURE IF EXISTS sp1;
 
 Testcase 3.1.2.50:
 ------------------
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_func_view.result
b/mysql-test/suite/funcs_1/r/innodb_func_view.result
--- a/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-05-18 08:59:20 -04:00
+++ b/mysql-test/suite/funcs_1/r/innodb_func_view.result	2008-05-18 18:32:22 -04:00
@@ -910,13 +910,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜÃ
 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 NU
 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 NU
 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;
@@ -2550,13 +2550,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
@@ -2565,13 +2565,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;
 
 
@@ -2918,13 +2918,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
@@ -2933,13 +2933,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;
 
 
@@ -3276,8 +3276,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
@@ -3294,8 +3294,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
@@ -3656,14 +3656,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
@@ -3672,14 +3672,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;
 
 
@@ -4018,14 +4018,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'
@@ -4037,14 +4037,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'
@@ -4392,14 +4392,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;
@@ -4410,14 +4410,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;
@@ -4752,8 +4752,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;
@@ -4764,8 +4764,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;
@@ -5064,8 +5064,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;
@@ -5076,8 +5076,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;
@@ -5245,7 +5245,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
@@ -5259,7 +5259,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
diff -Nrup a/mysql-test/suite/funcs_1/r/innodb_storedproc.result
b/mysql-test/suite/funcs_1/r/innodb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-05-18 08:59:26 -04:00
+++ b/mysql-test/suite/funcs_1/r/innodb_storedproc.result	2008-05-18 18:32:24 -04:00
@@ -162,7 +162,10 @@ CALL sp1( 1.797693134e+13 );
 @v1
 17976931340000.000000000000000000000000000000
 CALL sp1( 1.7976931348623157493578e+308 );
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+100 );
 @v1
 999999999999999999999999999999.999999999999999999999999999999
@@ -865,9 +868,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+30 );
 @v1
-123456789098765400000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-30 );
 @v1
 0.000000000000000000000000000000
@@ -875,9 +876,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+29 );
 @v1
-12345678909876540000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-29 );
 @v1
 0.000000000000000000000000000001
@@ -885,9 +884,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+28 );
 @v1
-1234567890987654000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-28 );
 @v1
 0.000000000000000000000000000012
@@ -895,9 +892,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+27 );
 @v1
-123456789098765400000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-27 );
 @v1
 0.000000000000000000000000000123
@@ -905,9 +900,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+26 );
 @v1
-12345678909876540000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-26 );
 @v1
 0.000000000000000000000000001235
@@ -915,9 +908,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+25 );
 @v1
-1234567890987654000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-25 );
 @v1
 0.000000000000000000000000012346
@@ -925,9 +916,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+24 );
 @v1
-123456789098765400000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-24 );
 @v1
 0.000000000000000000000000123457
@@ -935,9 +924,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+23 );
 @v1
-12345678909876540000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-23 );
 @v1
 0.000000000000000000000001234568
@@ -945,9 +932,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+22 );
 @v1
-1234567890987654000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-22 );
 @v1
 0.000000000000000000000012345679
@@ -955,9 +940,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+21 );
 @v1
-123456789098765400000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-21 );
 @v1
 0.000000000000000000000123456789
@@ -965,9 +948,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+20 );
 @v1
-12345678909876540000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-20 );
 @v1
 0.000000000000000000001234567891
@@ -975,9 +956,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+19 );
 @v1
-1234567890987654000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-19 );
 @v1
 0.000000000000000000012345678910
@@ -985,9 +964,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+18 );
 @v1
-123456789098765400.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-18 );
 @v1
 0.000000000000000000123456789099
@@ -995,9 +972,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+17 );
 @v1
-12345678909876540.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876544.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-17 );
 @v1
 0.000000000000000001234567890988
@@ -1005,9 +980,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+16 );
 @v1
-1234567890987654.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654.200000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-16 );
 @v1
 0.000000000000000012345678909877
@@ -1015,9 +988,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+15 );
 @v1
-123456789098765.400000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765.440000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-15 );
 @v1
 0.000000000000000123456789098765
@@ -1025,9 +996,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+14 );
 @v1
-12345678909876.540000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876.543000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-14 );
 @v1
 0.000000000000001234567890987654
@@ -1035,144 +1004,88 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+13 );
 @v1
-1234567890987.654000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987.654300000000000000000000000000
 CALL sp1( 0.1234567890987654321e-13 );
 @v1
-0.000000000000012345678909876540
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000012345678909876543
 CALL sp1( 0.1234567890987654321e+12 );
 @v1
-123456789098.765400000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098.765430000000000000000000000000
 CALL sp1( 0.1234567890987654321e-12 );
 @v1
-0.000000000000123456789098765400
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000123456789098765440
 CALL sp1( 0.1234567890987654321e+11 );
 @v1
-12345678909.876540000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909.876543000000000000000000000000
 CALL sp1( 0.1234567890987654321e-11 );
 @v1
-0.000000000001234567890987654000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000001234567890987654200
 CALL sp1( 0.1234567890987654321e+10 );
 @v1
-1234567890.987654000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890.987654200000000000000000000000
 CALL sp1( 0.1234567890987654321e-10 );
 @v1
-0.000000000012345678909876540000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000012345678909876543000
 CALL sp1( 0.1234567890987654321e+9 );
 @v1
-123456789.098765400000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789.098765430000000000000000000000
 CALL sp1( 0.1234567890987654321e-9 );
 @v1
-0.000000000123456789098765400000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000123456789098765420000
 CALL sp1( 0.1234567890987654321e+8 );
 @v1
-12345678.909876540000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678.909876544000000000000000000000
 CALL sp1( 0.1234567890987654321e-8 );
 @v1
-0.000000001234567890987654000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000001234567890987654400000
 CALL sp1( 0.1234567890987654321e+7 );
 @v1
-1234567.890987654000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567.890987654200000000000000000000
 CALL sp1( 0.1234567890987654321e-7 );
 @v1
-0.000000012345678909876540000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000012345678909876544000000
 CALL sp1( 0.1234567890987654321e+6 );
 @v1
-123456.789098765400000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456.789098765440000000000000000000
 CALL sp1( 0.1234567890987654321e-6 );
 @v1
-0.000000123456789098765400000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000123456789098765440000000
 CALL sp1( 0.1234567890987654321e+5 );
 @v1
-12345.678909876540000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345.678909876544000000000000000000
 CALL sp1( 0.1234567890987654321e-5 );
 @v1
-0.000001234567890987654000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000001234567890987654400000000
 CALL sp1( 0.1234567890987654321e+4 );
 @v1
-1234.567890987654000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234.567890987654200000000000000000
 CALL sp1( 0.1234567890987654321e-4 );
 @v1
-0.000012345678909876550000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000012345678909876543000000000
 CALL sp1( 0.1234567890987654321e+3 );
 @v1
-123.456789098765400000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123.456789098765430000000000000000
 CALL sp1( 0.1234567890987654321e-3 );
 @v1
-0.000123456789098765400000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000123456789098765420000000000
 CALL sp1( 0.1234567890987654321e+2 );
 @v1
-12.345678909876540000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12.345678909876543000000000000000
 CALL sp1( 0.1234567890987654321e-2 );
 @v1
-0.001234567890987654000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.001234567890987654300000000000
 CALL sp1( 0.1234567890987654321e+1 );
 @v1
-1.234567890987654000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1.234567890987654300000000000000
 CALL sp1( 0.1234567890987654321e-1 );
 @v1
-0.012345678909876540000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.012345678909876543000000000000
 CALL sp1( 0.1234567890987654321e+0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 CALL sp1( 0.1234567890987654321e-0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database
Collation
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is
simple	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -2573,7 +2486,7 @@ ERROR 42000: You have an error in your S
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE with()
 SELECT * from t1 where f2=f1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with()
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '()
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE write()
 SELECT * from t1 where f2=f1;
@@ -5431,7 +5344,7 @@ CREATE PROCEDURE sp1()
 with:BEGIN
 SELECT @x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with:BEGIN
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near ':BEGIN
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
@@ -9017,7 +8930,7 @@ CREATE PROCEDURE sp1()
 BEGIN
 declare with char;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with char;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11373,8 +11286,9 @@ BEGIN
 declare with condition for sqlstate '02000';
 declare exit handler for with set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with condition for sqlstate
'02000';
-declare exit handler for with set @var2 = 1' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'condition for sqlstate
'02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
@@ -13478,7 +13392,7 @@ CREATE PROCEDURE sp1( )
 BEGIN
 declare with handler for sqlstate '02000' set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with handler for sqlstate
'02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'handler for sqlstate '02000'
set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -16907,7 +16821,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
@@ -18008,8 +17922,6 @@ END//
 CALL sp70_n(-1e+40);
 f1
 -10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
 -10000000000000000000000000000000000000000
@@ -18022,8 +17934,6 @@ END//
 CALL sp71_nu(1.00e+40);
 f1
 10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
 10000000000000000000000000000000000000000
@@ -18036,8 +17946,6 @@ END//
 CALL sp72_nuz(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18050,8 +17958,6 @@ END//
 CALL sp73_n_z(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18097,7 +18003,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
@@ -19300,9 +19206,9 @@ SELECT var1, var2, var3, var4, var5, var
 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;
@@ -22568,8 +22474,8 @@ END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
 10	30	50
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE		
 DROP PROCEDURE sp6;
 drop table res_t9;
 
@@ -23507,7 +23413,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -23545,9 +23450,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-CALL h1();
-ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
-DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
 * Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_func_view.result
b/mysql-test/suite/funcs_1/r/memory_func_view.result
--- a/mysql-test/suite/funcs_1/r/memory_func_view.result	2008-05-18 08:59:37 -04:00
+++ b/mysql-test/suite/funcs_1/r/memory_func_view.result	2008-05-18 18:32:24 -04:00
@@ -910,13 +910,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜÃ
 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 NU
 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 NU
 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;
@@ -2550,13 +2550,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
@@ -2565,13 +2565,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;
 
 
@@ -2918,13 +2918,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
@@ -2933,13 +2933,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;
 
 
@@ -3276,8 +3276,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
@@ -3294,8 +3294,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
@@ -3656,14 +3656,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
@@ -3672,14 +3672,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;
 
 
@@ -4018,14 +4018,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'
@@ -4037,14 +4037,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'
@@ -4392,14 +4392,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;
@@ -4410,14 +4410,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;
@@ -4752,8 +4752,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;
@@ -4764,8 +4764,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;
@@ -5064,8 +5064,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;
@@ -5076,8 +5076,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;
@@ -5245,7 +5245,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
@@ -5259,7 +5259,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
diff -Nrup a/mysql-test/suite/funcs_1/r/memory_storedproc.result
b/mysql-test/suite/funcs_1/r/memory_storedproc.result
--- a/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-05-18 08:59:49 -04:00
+++ b/mysql-test/suite/funcs_1/r/memory_storedproc.result	2008-05-18 18:32:26 -04:00
@@ -162,7 +162,10 @@ CALL sp1( 1.797693134e+13 );
 @v1
 17976931340000.000000000000000000000000000000
 CALL sp1( 1.7976931348623157493578e+308 );
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+100 );
 @v1
 999999999999999999999999999999.999999999999999999999999999999
@@ -865,9 +868,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+30 );
 @v1
-123456789098765400000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-30 );
 @v1
 0.000000000000000000000000000000
@@ -875,9 +876,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+29 );
 @v1
-12345678909876540000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-29 );
 @v1
 0.000000000000000000000000000001
@@ -885,9 +884,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+28 );
 @v1
-1234567890987654000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-28 );
 @v1
 0.000000000000000000000000000012
@@ -895,9 +892,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+27 );
 @v1
-123456789098765400000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-27 );
 @v1
 0.000000000000000000000000000123
@@ -905,9 +900,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+26 );
 @v1
-12345678909876540000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-26 );
 @v1
 0.000000000000000000000000001235
@@ -915,9 +908,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+25 );
 @v1
-1234567890987654000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-25 );
 @v1
 0.000000000000000000000000012346
@@ -925,9 +916,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+24 );
 @v1
-123456789098765400000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-24 );
 @v1
 0.000000000000000000000000123457
@@ -935,9 +924,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+23 );
 @v1
-12345678909876540000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-23 );
 @v1
 0.000000000000000000000001234568
@@ -945,9 +932,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+22 );
 @v1
-1234567890987654000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-22 );
 @v1
 0.000000000000000000000012345679
@@ -955,9 +940,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+21 );
 @v1
-123456789098765400000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-21 );
 @v1
 0.000000000000000000000123456789
@@ -965,9 +948,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+20 );
 @v1
-12345678909876540000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-20 );
 @v1
 0.000000000000000000001234567891
@@ -975,9 +956,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+19 );
 @v1
-1234567890987654000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-19 );
 @v1
 0.000000000000000000012345678910
@@ -985,9 +964,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+18 );
 @v1
-123456789098765400.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-18 );
 @v1
 0.000000000000000000123456789099
@@ -995,9 +972,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+17 );
 @v1
-12345678909876540.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876544.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-17 );
 @v1
 0.000000000000000001234567890988
@@ -1005,9 +980,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+16 );
 @v1
-1234567890987654.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654.200000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-16 );
 @v1
 0.000000000000000012345678909877
@@ -1015,9 +988,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+15 );
 @v1
-123456789098765.400000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765.440000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-15 );
 @v1
 0.000000000000000123456789098765
@@ -1025,9 +996,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+14 );
 @v1
-12345678909876.540000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876.543000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-14 );
 @v1
 0.000000000000001234567890987654
@@ -1035,144 +1004,88 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+13 );
 @v1
-1234567890987.654000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987.654300000000000000000000000000
 CALL sp1( 0.1234567890987654321e-13 );
 @v1
-0.000000000000012345678909876540
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000012345678909876543
 CALL sp1( 0.1234567890987654321e+12 );
 @v1
-123456789098.765400000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098.765430000000000000000000000000
 CALL sp1( 0.1234567890987654321e-12 );
 @v1
-0.000000000000123456789098765400
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000123456789098765440
 CALL sp1( 0.1234567890987654321e+11 );
 @v1
-12345678909.876540000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909.876543000000000000000000000000
 CALL sp1( 0.1234567890987654321e-11 );
 @v1
-0.000000000001234567890987654000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000001234567890987654200
 CALL sp1( 0.1234567890987654321e+10 );
 @v1
-1234567890.987654000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890.987654200000000000000000000000
 CALL sp1( 0.1234567890987654321e-10 );
 @v1
-0.000000000012345678909876540000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000012345678909876543000
 CALL sp1( 0.1234567890987654321e+9 );
 @v1
-123456789.098765400000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789.098765430000000000000000000000
 CALL sp1( 0.1234567890987654321e-9 );
 @v1
-0.000000000123456789098765400000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000123456789098765420000
 CALL sp1( 0.1234567890987654321e+8 );
 @v1
-12345678.909876540000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678.909876544000000000000000000000
 CALL sp1( 0.1234567890987654321e-8 );
 @v1
-0.000000001234567890987654000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000001234567890987654400000
 CALL sp1( 0.1234567890987654321e+7 );
 @v1
-1234567.890987654000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567.890987654200000000000000000000
 CALL sp1( 0.1234567890987654321e-7 );
 @v1
-0.000000012345678909876540000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000012345678909876544000000
 CALL sp1( 0.1234567890987654321e+6 );
 @v1
-123456.789098765400000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456.789098765440000000000000000000
 CALL sp1( 0.1234567890987654321e-6 );
 @v1
-0.000000123456789098765400000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000123456789098765440000000
 CALL sp1( 0.1234567890987654321e+5 );
 @v1
-12345.678909876540000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345.678909876544000000000000000000
 CALL sp1( 0.1234567890987654321e-5 );
 @v1
-0.000001234567890987654000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000001234567890987654400000000
 CALL sp1( 0.1234567890987654321e+4 );
 @v1
-1234.567890987654000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234.567890987654200000000000000000
 CALL sp1( 0.1234567890987654321e-4 );
 @v1
-0.000012345678909876550000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000012345678909876543000000000
 CALL sp1( 0.1234567890987654321e+3 );
 @v1
-123.456789098765400000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123.456789098765430000000000000000
 CALL sp1( 0.1234567890987654321e-3 );
 @v1
-0.000123456789098765400000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000123456789098765420000000000
 CALL sp1( 0.1234567890987654321e+2 );
 @v1
-12.345678909876540000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12.345678909876543000000000000000
 CALL sp1( 0.1234567890987654321e-2 );
 @v1
-0.001234567890987654000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.001234567890987654300000000000
 CALL sp1( 0.1234567890987654321e+1 );
 @v1
-1.234567890987654000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1.234567890987654300000000000000
 CALL sp1( 0.1234567890987654321e-1 );
 @v1
-0.012345678909876540000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.012345678909876543000000000000
 CALL sp1( 0.1234567890987654321e+0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 CALL sp1( 0.1234567890987654321e-0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database
Collation
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is
simple	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -2573,7 +2486,7 @@ ERROR 42000: You have an error in your S
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE with()
 SELECT * from t1 where f2=f1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with()
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '()
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE write()
 SELECT * from t1 where f2=f1;
@@ -5431,7 +5344,7 @@ CREATE PROCEDURE sp1()
 with:BEGIN
 SELECT @x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with:BEGIN
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near ':BEGIN
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
@@ -9017,7 +8930,7 @@ CREATE PROCEDURE sp1()
 BEGIN
 declare with char;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with char;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11373,8 +11286,9 @@ BEGIN
 declare with condition for sqlstate '02000';
 declare exit handler for with set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with condition for sqlstate
'02000';
-declare exit handler for with set @var2 = 1' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'condition for sqlstate
'02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
@@ -13478,7 +13392,7 @@ CREATE PROCEDURE sp1( )
 BEGIN
 declare with handler for sqlstate '02000' set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with handler for sqlstate
'02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'handler for sqlstate '02000'
set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -16907,7 +16821,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
@@ -18008,8 +17922,6 @@ END//
 CALL sp70_n(-1e+40);
 f1
 -10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
 -10000000000000000000000000000000000000000
@@ -18022,8 +17934,6 @@ END//
 CALL sp71_nu(1.00e+40);
 f1
 10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
 10000000000000000000000000000000000000000
@@ -18036,8 +17946,6 @@ END//
 CALL sp72_nuz(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18050,8 +17958,6 @@ END//
 CALL sp73_n_z(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18097,7 +18003,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
@@ -19300,9 +19206,9 @@ SELECT var1, var2, var3, var4, var5, var
 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;
@@ -22568,8 +22474,8 @@ END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
 10	30	50
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE		
 DROP PROCEDURE sp6;
 drop table res_t9;
 
@@ -23507,7 +23413,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -23545,9 +23450,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-CALL h1();
-ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
-DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
 * Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_func_view.result
b/mysql-test/suite/funcs_1/r/myisam_func_view.result
--- a/mysql-test/suite/funcs_1/r/myisam_func_view.result	2008-05-18 08:59:57 -04:00
+++ b/mysql-test/suite/funcs_1/r/myisam_func_view.result	2008-05-18 18:32:27 -04:00
@@ -910,13 +910,13 @@ SELECT LEFT('AaBbCcDdEeFfGgHhIiJjÄäÜÃ
 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 NU
 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 NU
 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;
@@ -2550,13 +2550,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
@@ -2565,13 +2565,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;
 
 
@@ -2918,13 +2918,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
@@ -2933,13 +2933,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;
 
 
@@ -3276,8 +3276,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
@@ -3294,8 +3294,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
@@ -3656,14 +3656,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
@@ -3672,14 +3672,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;
 
 
@@ -4018,14 +4018,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'
@@ -4037,14 +4037,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'
@@ -4392,14 +4392,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;
@@ -4410,14 +4410,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;
@@ -4752,8 +4752,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;
@@ -4764,8 +4764,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;
@@ -5064,8 +5064,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;
@@ -5076,8 +5076,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;
@@ -5245,7 +5245,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
@@ -5259,7 +5259,7 @@ WHERE select_id = 1 OR select_id IS NULL
 sqrt(my_bigint)	my_bigint	id
 NULL	NULL	1
 NULL	-9223372036854775808	2
-3037000499.976	9223372036854775807	3
+3037000499.97605	9223372036854775807	3
 0	0	4
 NULL	-1	5
 2	4	6
diff -Nrup a/mysql-test/suite/funcs_1/r/myisam_storedproc.result
b/mysql-test/suite/funcs_1/r/myisam_storedproc.result
--- a/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-05-18 09:00:03 -04:00
+++ b/mysql-test/suite/funcs_1/r/myisam_storedproc.result	2008-05-18 18:32:28 -04:00
@@ -162,7 +162,10 @@ CALL sp1( 1.797693134e+13 );
 @v1
 17976931340000.000000000000000000000000000000
 CALL sp1( 1.7976931348623157493578e+308 );
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+100 );
 @v1
 999999999999999999999999999999.999999999999999999999999999999
@@ -865,9 +868,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+30 );
 @v1
-123456789098765400000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-30 );
 @v1
 0.000000000000000000000000000000
@@ -875,9 +876,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+29 );
 @v1
-12345678909876540000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-29 );
 @v1
 0.000000000000000000000000000001
@@ -885,9 +884,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+28 );
 @v1
-1234567890987654000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-28 );
 @v1
 0.000000000000000000000000000012
@@ -895,9 +892,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+27 );
 @v1
-123456789098765400000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-27 );
 @v1
 0.000000000000000000000000000123
@@ -905,9 +900,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+26 );
 @v1
-12345678909876540000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-26 );
 @v1
 0.000000000000000000000000001235
@@ -915,9 +908,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+25 );
 @v1
-1234567890987654000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-25 );
 @v1
 0.000000000000000000000000012346
@@ -925,9 +916,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+24 );
 @v1
-123456789098765400000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-24 );
 @v1
 0.000000000000000000000000123457
@@ -935,9 +924,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+23 );
 @v1
-12345678909876540000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-23 );
 @v1
 0.000000000000000000000001234568
@@ -945,9 +932,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+22 );
 @v1
-1234567890987654000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-22 );
 @v1
 0.000000000000000000000012345679
@@ -955,9 +940,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+21 );
 @v1
-123456789098765400000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-21 );
 @v1
 0.000000000000000000000123456789
@@ -965,9 +948,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+20 );
 @v1
-12345678909876540000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-20 );
 @v1
 0.000000000000000000001234567891
@@ -975,9 +956,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+19 );
 @v1
-1234567890987654000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-19 );
 @v1
 0.000000000000000000012345678910
@@ -985,9 +964,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+18 );
 @v1
-123456789098765400.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-18 );
 @v1
 0.000000000000000000123456789099
@@ -995,9 +972,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+17 );
 @v1
-12345678909876540.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876544.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-17 );
 @v1
 0.000000000000000001234567890988
@@ -1005,9 +980,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+16 );
 @v1
-1234567890987654.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654.200000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-16 );
 @v1
 0.000000000000000012345678909877
@@ -1015,9 +988,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+15 );
 @v1
-123456789098765.400000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765.440000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-15 );
 @v1
 0.000000000000000123456789098765
@@ -1025,9 +996,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+14 );
 @v1
-12345678909876.540000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876.543000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-14 );
 @v1
 0.000000000000001234567890987654
@@ -1035,144 +1004,88 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+13 );
 @v1
-1234567890987.654000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987.654300000000000000000000000000
 CALL sp1( 0.1234567890987654321e-13 );
 @v1
-0.000000000000012345678909876540
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000012345678909876543
 CALL sp1( 0.1234567890987654321e+12 );
 @v1
-123456789098.765400000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098.765430000000000000000000000000
 CALL sp1( 0.1234567890987654321e-12 );
 @v1
-0.000000000000123456789098765400
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000123456789098765440
 CALL sp1( 0.1234567890987654321e+11 );
 @v1
-12345678909.876540000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909.876543000000000000000000000000
 CALL sp1( 0.1234567890987654321e-11 );
 @v1
-0.000000000001234567890987654000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000001234567890987654200
 CALL sp1( 0.1234567890987654321e+10 );
 @v1
-1234567890.987654000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890.987654200000000000000000000000
 CALL sp1( 0.1234567890987654321e-10 );
 @v1
-0.000000000012345678909876540000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000012345678909876543000
 CALL sp1( 0.1234567890987654321e+9 );
 @v1
-123456789.098765400000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789.098765430000000000000000000000
 CALL sp1( 0.1234567890987654321e-9 );
 @v1
-0.000000000123456789098765400000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000123456789098765420000
 CALL sp1( 0.1234567890987654321e+8 );
 @v1
-12345678.909876540000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678.909876544000000000000000000000
 CALL sp1( 0.1234567890987654321e-8 );
 @v1
-0.000000001234567890987654000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000001234567890987654400000
 CALL sp1( 0.1234567890987654321e+7 );
 @v1
-1234567.890987654000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567.890987654200000000000000000000
 CALL sp1( 0.1234567890987654321e-7 );
 @v1
-0.000000012345678909876540000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000012345678909876544000000
 CALL sp1( 0.1234567890987654321e+6 );
 @v1
-123456.789098765400000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456.789098765440000000000000000000
 CALL sp1( 0.1234567890987654321e-6 );
 @v1
-0.000000123456789098765400000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000123456789098765440000000
 CALL sp1( 0.1234567890987654321e+5 );
 @v1
-12345.678909876540000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345.678909876544000000000000000000
 CALL sp1( 0.1234567890987654321e-5 );
 @v1
-0.000001234567890987654000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000001234567890987654400000000
 CALL sp1( 0.1234567890987654321e+4 );
 @v1
-1234.567890987654000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234.567890987654200000000000000000
 CALL sp1( 0.1234567890987654321e-4 );
 @v1
-0.000012345678909876550000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000012345678909876543000000000
 CALL sp1( 0.1234567890987654321e+3 );
 @v1
-123.456789098765400000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123.456789098765430000000000000000
 CALL sp1( 0.1234567890987654321e-3 );
 @v1
-0.000123456789098765400000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000123456789098765420000000000
 CALL sp1( 0.1234567890987654321e+2 );
 @v1
-12.345678909876540000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12.345678909876543000000000000000
 CALL sp1( 0.1234567890987654321e-2 );
 @v1
-0.001234567890987654000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.001234567890987654300000000000
 CALL sp1( 0.1234567890987654321e+1 );
 @v1
-1.234567890987654000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1.234567890987654300000000000000
 CALL sp1( 0.1234567890987654321e-1 );
 @v1
-0.012345678909876540000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.012345678909876543000000000000
 CALL sp1( 0.1234567890987654321e+0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 CALL sp1( 0.1234567890987654321e-0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database
Collation
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is
simple	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -2573,7 +2486,7 @@ ERROR 42000: You have an error in your S
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE with()
 SELECT * from t1 where f2=f1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with()
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '()
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE write()
 SELECT * from t1 where f2=f1;
@@ -5431,7 +5344,7 @@ CREATE PROCEDURE sp1()
 with:BEGIN
 SELECT @x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with:BEGIN
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near ':BEGIN
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
@@ -9017,7 +8930,7 @@ CREATE PROCEDURE sp1()
 BEGIN
 declare with char;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with char;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11373,8 +11286,9 @@ BEGIN
 declare with condition for sqlstate '02000';
 declare exit handler for with set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with condition for sqlstate
'02000';
-declare exit handler for with set @var2 = 1' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'condition for sqlstate
'02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
@@ -13478,7 +13392,7 @@ CREATE PROCEDURE sp1( )
 BEGIN
 declare with handler for sqlstate '02000' set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with handler for sqlstate
'02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'handler for sqlstate '02000'
set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -16907,7 +16821,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
@@ -18008,8 +17922,6 @@ END//
 CALL sp70_n(-1e+40);
 f1
 -10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
 -10000000000000000000000000000000000000000
@@ -18022,8 +17934,6 @@ END//
 CALL sp71_nu(1.00e+40);
 f1
 10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
 10000000000000000000000000000000000000000
@@ -18036,8 +17946,6 @@ END//
 CALL sp72_nuz(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18050,8 +17958,6 @@ END//
 CALL sp73_n_z(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18097,7 +18003,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
@@ -19300,9 +19206,9 @@ SELECT var1, var2, var3, var4, var5, var
 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;
@@ -22568,8 +22474,8 @@ END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
 10	30	50
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE		
 DROP PROCEDURE sp6;
 drop table res_t9;
 
@@ -23507,7 +23413,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -23545,9 +23450,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-CALL h1();
-ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
-DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
 * Ensure that a handler condition of sqlwarning takes the same action as a
diff -Nrup a/mysql-test/suite/funcs_1/r/ndb_storedproc.result
b/mysql-test/suite/funcs_1/r/ndb_storedproc.result
--- a/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-05-18 09:03:26 -04:00
+++ b/mysql-test/suite/funcs_1/r/ndb_storedproc.result	2008-05-18 18:32:30 -04:00
@@ -162,7 +162,10 @@ CALL sp1( 1.797693134e+13 );
 @v1
 17976931340000.000000000000000000000000000000
 CALL sp1( 1.7976931348623157493578e+308 );
-ERROR 22007: Illegal double '1.7976931348623157493578e+308' value found during parsing
+@v1
+999999999999999999999999999999.999999999999999999999999999999
+Warnings:
+Warning	1264	Out of range value for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+100 );
 @v1
 999999999999999999999999999999.999999999999999999999999999999
@@ -865,9 +868,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+30 );
 @v1
-123456789098765400000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-30 );
 @v1
 0.000000000000000000000000000000
@@ -875,9 +876,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+29 );
 @v1
-12345678909876540000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-29 );
 @v1
 0.000000000000000000000000000001
@@ -885,9 +884,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+28 );
 @v1
-1234567890987654000000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-28 );
 @v1
 0.000000000000000000000000000012
@@ -895,9 +892,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+27 );
 @v1
-123456789098765400000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-27 );
 @v1
 0.000000000000000000000000000123
@@ -905,9 +900,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+26 );
 @v1
-12345678909876540000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-26 );
 @v1
 0.000000000000000000000000001235
@@ -915,9 +908,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+25 );
 @v1
-1234567890987654000000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-25 );
 @v1
 0.000000000000000000000000012346
@@ -925,9 +916,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+24 );
 @v1
-123456789098765400000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-24 );
 @v1
 0.000000000000000000000000123457
@@ -935,9 +924,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+23 );
 @v1
-12345678909876540000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-23 );
 @v1
 0.000000000000000000000001234568
@@ -945,9 +932,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+22 );
 @v1
-1234567890987654000000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654300000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-22 );
 @v1
 0.000000000000000000000012345679
@@ -955,9 +940,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+21 );
 @v1
-123456789098765400000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765430000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-21 );
 @v1
 0.000000000000000000000123456789
@@ -965,9 +948,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+20 );
 @v1
-12345678909876540000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876543000.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-20 );
 @v1
 0.000000000000000000001234567891
@@ -975,9 +956,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+19 );
 @v1
-1234567890987654000.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654400.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-19 );
 @v1
 0.000000000000000000012345678910
@@ -985,9 +964,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+18 );
 @v1
-123456789098765400.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765440.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-18 );
 @v1
 0.000000000000000000123456789099
@@ -995,9 +972,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+17 );
 @v1
-12345678909876540.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876544.000000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-17 );
 @v1
 0.000000000000000001234567890988
@@ -1005,9 +980,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+16 );
 @v1
-1234567890987654.000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987654.200000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-16 );
 @v1
 0.000000000000000012345678909877
@@ -1015,9 +988,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+15 );
 @v1
-123456789098765.400000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098765.440000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-15 );
 @v1
 0.000000000000000123456789098765
@@ -1025,9 +996,7 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+14 );
 @v1
-12345678909876.540000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909876.543000000000000000000000000000
 CALL sp1( 0.1234567890987654321e-14 );
 @v1
 0.000000000000001234567890987654
@@ -1035,144 +1004,88 @@ Warnings:
 Note	1265	Data truncated for column 'f1' at row 1
 CALL sp1( 0.1234567890987654321e+13 );
 @v1
-1234567890987.654000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890987.654300000000000000000000000000
 CALL sp1( 0.1234567890987654321e-13 );
 @v1
-0.000000000000012345678909876540
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000012345678909876543
 CALL sp1( 0.1234567890987654321e+12 );
 @v1
-123456789098.765400000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789098.765430000000000000000000000000
 CALL sp1( 0.1234567890987654321e-12 );
 @v1
-0.000000000000123456789098765400
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000000123456789098765440
 CALL sp1( 0.1234567890987654321e+11 );
 @v1
-12345678909.876540000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678909.876543000000000000000000000000
 CALL sp1( 0.1234567890987654321e-11 );
 @v1
-0.000000000001234567890987654000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000001234567890987654200
 CALL sp1( 0.1234567890987654321e+10 );
 @v1
-1234567890.987654000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567890.987654200000000000000000000000
 CALL sp1( 0.1234567890987654321e-10 );
 @v1
-0.000000000012345678909876540000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000012345678909876543000
 CALL sp1( 0.1234567890987654321e+9 );
 @v1
-123456789.098765400000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456789.098765430000000000000000000000
 CALL sp1( 0.1234567890987654321e-9 );
 @v1
-0.000000000123456789098765400000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000000123456789098765420000
 CALL sp1( 0.1234567890987654321e+8 );
 @v1
-12345678.909876540000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345678.909876544000000000000000000000
 CALL sp1( 0.1234567890987654321e-8 );
 @v1
-0.000000001234567890987654000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000001234567890987654400000
 CALL sp1( 0.1234567890987654321e+7 );
 @v1
-1234567.890987654000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234567.890987654200000000000000000000
 CALL sp1( 0.1234567890987654321e-7 );
 @v1
-0.000000012345678909876540000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000012345678909876544000000
 CALL sp1( 0.1234567890987654321e+6 );
 @v1
-123456.789098765400000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123456.789098765440000000000000000000
 CALL sp1( 0.1234567890987654321e-6 );
 @v1
-0.000000123456789098765400000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000000123456789098765440000000
 CALL sp1( 0.1234567890987654321e+5 );
 @v1
-12345.678909876540000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12345.678909876544000000000000000000
 CALL sp1( 0.1234567890987654321e-5 );
 @v1
-0.000001234567890987654000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000001234567890987654400000000
 CALL sp1( 0.1234567890987654321e+4 );
 @v1
-1234.567890987654000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1234.567890987654200000000000000000
 CALL sp1( 0.1234567890987654321e-4 );
 @v1
-0.000012345678909876550000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000012345678909876543000000000
 CALL sp1( 0.1234567890987654321e+3 );
 @v1
-123.456789098765400000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+123.456789098765430000000000000000
 CALL sp1( 0.1234567890987654321e-3 );
 @v1
-0.000123456789098765400000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.000123456789098765420000000000
 CALL sp1( 0.1234567890987654321e+2 );
 @v1
-12.345678909876540000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+12.345678909876543000000000000000
 CALL sp1( 0.1234567890987654321e-2 );
 @v1
-0.001234567890987654000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.001234567890987654300000000000
 CALL sp1( 0.1234567890987654321e+1 );
 @v1
-1.234567890987654000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+1.234567890987654300000000000000
 CALL sp1( 0.1234567890987654321e-1 );
 @v1
-0.012345678909876540000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.012345678909876543000000000000
 CALL sp1( 0.1234567890987654321e+0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 CALL sp1( 0.1234567890987654321e-0 );
 @v1
-0.123456789098765400000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
+0.123456789098765440000000000000
 SHOW PROCEDURE status;
 Db	Name	Type	Definer	Modified	Created	Security_type	Comment	character_set_client	collation_connection	Database
Collation
 db_storedproc	sp1	PROCEDURE	root@localhost	modified	created	INVOKER	this is
simple	latin1	latin1_swedish_ci	latin1_swedish_ci
@@ -2573,7 +2486,7 @@ ERROR 42000: You have an error in your S
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE with()
 SELECT * from t1 where f2=f1;
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with()
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near '()
 SELECT * from t1 where f2=f1' at line 1
 CREATE PROCEDURE write()
 SELECT * from t1 where f2=f1;
@@ -5431,7 +5344,7 @@ CREATE PROCEDURE sp1()
 with:BEGIN
 SELECT @x;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with:BEGIN
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near ':BEGIN
 SELECT @x;
 END' at line 2
 DROP PROCEDURE IF EXISTS sp1;
@@ -9017,7 +8930,7 @@ CREATE PROCEDURE sp1()
 BEGIN
 declare with char;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with char;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'char;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -11373,8 +11286,9 @@ BEGIN
 declare with condition for sqlstate '02000';
 declare exit handler for with set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with condition for sqlstate
'02000';
-declare exit handler for with set @var2 = 1' at line 3
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'condition for sqlstate
'02000';
+declare exit handler for with set @var2 = 1;
+END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
 Note	1305	PROCEDURE sp1 does not exist
@@ -13478,7 +13392,7 @@ CREATE PROCEDURE sp1( )
 BEGIN
 declare with handler for sqlstate '02000' set @var2 = 1;
 END//
-ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'with handler for sqlstate
'02000' set @var2 = 1;
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to
your MySQL server version for the right syntax to use near 'handler for sqlstate '02000'
set @var2 = 1;
 END' at line 3
 DROP PROCEDURE IF EXISTS sp1;
 Warnings:
@@ -16907,7 +16821,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
@@ -18008,8 +17922,6 @@ END//
 CALL sp70_n(-1e+40);
 f1
 -10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp70_n( -10000000000000000000000000000000000000000 );
 f1
 -10000000000000000000000000000000000000000
@@ -18022,8 +17934,6 @@ END//
 CALL sp71_nu(1.00e+40);
 f1
 10000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp71_nu( 10000000000000000000000000000000000000000 );
 f1
 10000000000000000000000000000000000000000
@@ -18036,8 +17946,6 @@ END//
 CALL sp72_nuz(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp72_nuz( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18050,8 +17958,6 @@ END//
 CALL sp73_n_z(1.00e+40);
 f1
 0000000000000000000000010000000000000000000000000000000000000000
-Warnings:
-Note	1265	Data truncated for column 'f1' at row 1
 CALL sp73_n_z( 10000000000000000000000000000000000000000 );
 f1
 0000000000000000000000010000000000000000000000000000000000000000
@@ -18097,7 +18003,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
@@ -19300,9 +19206,9 @@ SELECT var1, var2, var3, var4, var5, var
 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;
@@ -22568,8 +22474,8 @@ END//
 CALL sp6 (10, 20, 30, 40, 50);
 f1	f2	f3
 10	30	50
-Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
-res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE	
+Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_Comment
+res_t9	1	index_1	1	f1	A	NULL	5	NULL	YES	BTREE		
 DROP PROCEDURE sp6;
 drop table res_t9;
 
@@ -23507,7 +23413,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-DROP PROCEDURE IF EXISTS h1;
 
 Testcase 4.11.40:
 --------------------------------------------------------------------------------
@@ -23545,9 +23450,6 @@ END;
 SELECT @x, x1;
 END//
 ERROR 42000: Bad SQLSTATE: '00000'
-CALL h1();
-ERROR 42000: PROCEDURE db_storedproc.h1 does not exist
-DROP PROCEDURE IF EXISTS h1;
 
 * Testcase 3.1.2.53 (4.11.42):
 * Ensure that a handler condition of sqlwarning takes the same action as a