diff options
| author | unknown <kent@mysql.com> | 2005-10-13 12:23:50 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-10-13 12:23:50 +0200 |
| commit | 796e977764fcfe6a564063fc6d7ac58a53660e0a (patch) | |
| tree | 28cef7e8dcc89013bc07d4239ae24e9c5dfc25ab /sql/item.h | |
| parent | 335b7b2ae75944144005e390df82def1cc9ec93e (diff) | |
| parent | a094d013d6281c9beb0c143097229d9ed9209c61 (diff) | |
| download | mariadb-git-796e977764fcfe6a564063fc6d7ac58a53660e0a.tar.gz | |
Merge
mysql-test/t/cast.test:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 320591d4d99..7a7e080db02 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1331,6 +1331,14 @@ public: longlong val_int() { DBUG_ASSERT(fixed == 1); + if (value <= (double) LONGLONG_MIN) + { + return LONGLONG_MIN; + } + else if (value >= (double) (ulonglong) LONGLONG_MAX) + { + return LONGLONG_MAX; + } return (longlong) (value+(value > 0 ? 0.5 : -0.5)); } String *val_str(String*); |