diff options
| author | unknown <bar@mysql.com> | 2006-03-28 18:24:04 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2006-03-28 18:24:04 +0500 |
| commit | 8cf93ac629d6b4c8b8519a622318148ad9793f48 (patch) | |
| tree | aef94fbdc9edee96505fffafc01ae65dbe520be5 /sql/field.cc | |
| parent | 27000fb555ad90e265b56dffbc2193d0e82690cf (diff) | |
| parent | 17d2b065f479aab2162a2d63bc51e3b6638f71d1 (diff) | |
| download | mariadb-git-8cf93ac629d6b4c8b8519a622318148ad9793f48.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.1-new
mysql-test/r/cast.result:
Auto merged
sql/field.cc:
Auto merged
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 65c0d1b9397..708b239b494 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -4245,6 +4245,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); } |