diff options
| author | unknown <bar@mysql.com> | 2006-03-28 17:07:26 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-28 17:07:26 +0500 |
| commit | e1cd462ea6929c6f7fc7e703248628ba49b96ba0 (patch) | |
| tree | cb6386e1dc7095e7231e33e66f1b6cfb993dd3ea | |
| parent | 5d621a1b97618201cd55e56282b965ebe5e5769e (diff) | |
| parent | 4ccd3761004caa83004558c5999052414d4d2df4 (diff) | |
| download | mariadb-git-e1cd462ea6929c6f7fc7e703248628ba49b96ba0.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
into mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
mysql-test/t/cast.test:
Auto merged
mysql-test/r/cast.result:
After merge fix
sql/field.cc:
After merge fix
| -rw-r--r-- | mysql-test/r/cast.result | 8 | ||||
| -rw-r--r-- | mysql-test/t/cast.test | 9 | ||||
| -rw-r--r-- | sql/field.cc | 5 |
3 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/cast.result b/mysql-test/r/cast.result index 8da18df1954..4a3549b9a38 100644 --- a/mysql-test/r/cast.result +++ b/mysql-test/r/cast.result @@ -370,3 +370,11 @@ 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; diff --git a/mysql-test/t/cast.test b/mysql-test/t/cast.test index dc7f695e38e..7e09f44397c 100644 --- a/mysql-test/t/cast.test +++ b/mysql-test/t/cast.test @@ -165,6 +165,15 @@ select cast(repeat('1',20) as signed); # 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 diff --git a/sql/field.cc b/sql/field.cc index eab62cd1958..6cd5147648f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4240,6 +4240,11 @@ longlong Field_double::val_int(void) else #endif 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) rint(j); } |