cast.result:

  After merge fix.


mysql-test/r/cast.result:
  After merge fix.

mysql-test/r/cast.result

@@ -337,6 +337,14 @@ Warning	1105	Cast to signed converted positive out-of-range integer to it's nega
 select cast(1.0e+300 as signed int);
 cast(1.0e+300 as signed int)
 9223372036854775807
+CREATE TABLE t1 (f1 double);
+INSERT INTO t1 SET f1 = -1.0e+30 ;
+INSERT INTO t1 SET f1 = +1.0e+30 ;
+SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
+double_val	cast_val
+-1e+30	-9223372036854775808
+1e+30	9223372036854775807
+DROP TABLE t1;
 select cast('1.2' as decimal(3,2));
 cast('1.2' as decimal(3,2))
 1.20
@@ -370,11 +378,3 @@ DROP TABLE t1;
 select cast(NULL as decimal(6)) as t1;
 t1
 NULL
-CREATE TABLE t1 (f1 double);
-INSERT INTO t1 SET f1 = -1.0e+30 ;
-INSERT INTO t1 SET f1 = +1.0e+30 ;
-SELECT f1 AS double_val, CAST(f1 AS SIGNED INT) AS cast_val FROM t1;
-double_val	cast_val
--1e+30	-9223372036854775808
-1e+30	9223372036854775807
-DROP TABLE t1;