diff options
| author | unknown <igor@rurik.mysql.com> | 2005-12-02 20:42:36 -0800 |
|---|---|---|
| committer | unknown <igor@rurik.mysql.com> | 2005-12-02 20:42:36 -0800 |
| commit | e324da302f39998d654b5b112a0342cad0427e35 (patch) | |
| tree | a7f18b069781ad44463394d0a6a6a4d7f37b560a /sql/item_func.cc | |
| parent | 448327afb42e7b4d98ebd231ff7482ba59f0e921 (diff) | |
| parent | 2883e932ef55268d90c57f926d08df7b9a068f1a (diff) | |
| download | mariadb-git-e324da302f39998d654b5b112a0342cad0427e35.tar.gz | |
Merge rurik.mysql.com:/home/igor/mysql-5.0
into rurik.mysql.com:/home/igor/dev/mysql-5.0-2
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
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 f35265f9135..92363661911 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; |