database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-07 06:01:31 +03:00
Code Activity

Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/bar/mysql-4.1.b15098


sql/field.cc:
  Auto merged
This commit is contained in:
unknown
2006-03-28 18:32:58 +05:00
parent 7130316d15 4ccd376100
commit a8c9bbd4be
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/cast.result
View File

@ -267,3 +267,11 @@ Warning 1105 Cast to signed converted positive out-of-range integer to it's nega
select cast(1.0e+300 as signed int); select cast(1.0e+300 as signed int);
cast(1.0e+300 as signed int) cast(1.0e+300 as signed int)
9223372036854775807 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;

9
mysql-test/t/cast.test
View File

@ -152,4 +152,13 @@ select cast(repeat('1',20) as signed);
# #
select cast(1.0e+300 as signed int); select cast(1.0e+300 as signed int);
#
# Bugs: #15098: CAST(column double TO signed int), wrong result
#
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;
DROP TABLE t1;
# End of 4.1 tests # End of 4.1 tests

5
sql/field.cc
View File

@ -3385,6 +3385,11 @@ longlong Field_double::val_int(void)
else else
#endif #endif
doubleget(j,ptr); doubleget(j,ptr);
/* Check whether we fit into longlong range */
if (j <= (double) LONGLONG_MIN)
return (longlong) LONGLONG_MIN;
if (j >= (double) (ulonglong) LONGLONG_MAX)
return (longlong) LONGLONG_MAX;
return ((longlong) j); return ((longlong) j);
} }