diff options
| author | unknown <pem@mysql.com> | 2005-12-02 18:43:08 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2005-12-02 18:43:08 +0100 |
| commit | 176f36fa55345f050ec9a6381238c6c5af658ffe (patch) | |
| tree | 556e261cd5a80399d70cb1f9463b4f22eb237ca8 /sql/item_func.cc | |
| parent | 5c025e3f8b2e1dd9d07c0c1e1f6bdb545c1b84b1 (diff) | |
| parent | 110b887c4e6bbe27577c1ade5dfbc9479957bf20 (diff) | |
| download | mariadb-git-176f36fa55345f050ec9a6381238c6c5af658ffe.tar.gz | |
Merge mysql.com:/usr/local/bk/mysql-5.0
into mysql.com:/usr/home/pem/mysql-5.1-new
mysql-test/r/sp.result:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_sum.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 b9e0ea59d84..f8f81b65e76 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -737,7 +737,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; |