database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

5
sql/field.cc
View File

@ -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);
}