diff options
| author | unknown <ramil@mysql.com> | 2005-12-02 11:57:26 +0400 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-12-02 11:57:26 +0400 |
| commit | 858eef452fd1c32bbbf672720043ddcedf6095ce (patch) | |
| tree | 8ed6511351668d1941fe065b7e07e20354935a23 /sql/item.h | |
| parent | 025d8c14f64c9df4e5942de963234516adf7ffea (diff) | |
| parent | 490a1e2855078d661b584ef690a05ca4defceebd (diff) | |
| download | mariadb-git-858eef452fd1c32bbbf672720043ddcedf6095ce.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/ram/work/5.0.b12956
mysql-test/r/ps.result:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.h b/sql/item.h index d41b8370911..c562e30d23d 100644 --- a/sql/item.h +++ b/sql/item.h @@ -159,7 +159,7 @@ struct Hybrid_type_traits { val->real/= ulonglong2double(u); } virtual longlong val_int(Hybrid_type *val, bool unsigned_flag) const - { return (longlong) val->real; } + { return (longlong) rint(val->real); } virtual double val_real(Hybrid_type *val) const { return val->real; } virtual my_decimal *val_decimal(Hybrid_type *val, my_decimal *buf) const; virtual String *val_str(Hybrid_type *val, String *buf, uint8 decimals) const; @@ -1354,7 +1354,7 @@ public: { return LONGLONG_MAX; } - return (longlong) (value+(value > 0 ? 0.5 : -0.5)); + return (longlong) rint(value); } String *val_str(String*); my_decimal *val_decimal(my_decimal *); |