diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-06-13 11:37:51 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2012-06-13 11:37:51 +0200 |
| commit | b14d3adad9d10a8575bebca7e7af0ff7ef9f71b1 (patch) | |
| tree | 33bdb639d818d681f235d5563cec7b297a32b5e0 /sql/item.cc | |
| parent | 9892ace475752e0ddd333500bec91e13ca54d0f3 (diff) | |
| parent | afe1ef5e3a1824ebbfd31fa95b6a198045a0ed34 (diff) | |
| download | mariadb-git-b14d3adad9d10a8575bebca7e7af0ff7ef9f71b1.tar.gz | |
merge
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index 3af415fe5c2..3031e90c9b2 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1265,7 +1265,7 @@ err: bool Item::get_seconds(ulonglong *sec, ulong *sec_part) { - if (result_type() == INT_RESULT) + if (decimals == 0) { // optimize for an important special case longlong val= val_int(); bool neg= val < 0 && !unsigned_flag; |