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_func.cc | |
| 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_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index ef3ebde74e5..89561e8eb17 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -735,7 +735,7 @@ longlong Item_func_numhybrid::val_int() case INT_RESULT: return int_op(); case REAL_RESULT: - return (longlong)real_op(); + return (longlong) rint(real_op()); case STRING_RESULT: { int err_not_used; |