diff options
| author | bar@mysql.com <> | 2006-03-28 18:32:58 +0500 |
|---|---|---|
| committer | bar@mysql.com <> | 2006-03-28 18:32:58 +0500 |
| commit | 4886c53fbb3850c3775e67508a81cd083e5651a1 (patch) | |
| tree | 1802499d74dc3f5c116bc4e3711fda25016c915b /sql/field.cc | |
| parent | 04f059c5bfd050ed82c0bf456dc1e4f7d6bc0937 (diff) | |
| parent | 3e284e22a16d872b02a390e4f44d40cf535558b5 (diff) | |
| download | mariadb-git-4886c53fbb3850c3775e67508a81cd083e5651a1.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b15098
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/field.cc b/sql/field.cc index fd6eba9e492..a64eaad7308 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -3385,6 +3385,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) j); } |