diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-06 17:20:27 +0300 |
| commit | 7cd11f45beeb162db84dea423a040a296ac2856e (patch) | |
| tree | 3fcae3d99a56ba99d825ae4457901d49e4b474e3 /sql/item.h | |
| parent | 5462a6dbcc68d51a89356255fb4f398be7d62c27 (diff) | |
| parent | 3e2c9aac11a95d8cbb61e1937e4ebe18c7e86698 (diff) | |
| download | mariadb-git-7cd11f45beeb162db84dea423a040a296ac2856e.tar.gz | |
Manual merge from mysql-trunk-merge.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/item.h b/sql/item.h index bb7ef73a5e2..72e4e37342a 100644 --- a/sql/item.h +++ b/sql/item.h @@ -770,10 +770,9 @@ public: virtual cond_result eq_cmp_result() const { return COND_OK; } inline uint float_length(uint decimals_par) const { return decimals != NOT_FIXED_DEC ? (DBL_DIG+2+decimals_par) : DBL_DIG+8;} - /** Returns the uncapped decimal precision of this item. */ virtual uint decimal_precision() const; inline int decimal_int_part() const - { return decimal_precision() - decimals; } + { return my_decimal_int_part(decimal_precision(), decimals); } /* Returns true if this is constant (during query execution, i.e. its value will not change until next fix_fields) and its value is known. @@ -3154,6 +3153,6 @@ void mark_select_range_as_dependent(THD *thd, extern Cached_item *new_Cached_item(THD *thd, Item *item); extern Item_result item_cmp_type(Item_result a,Item_result b); extern void resolve_const_item(THD *thd, Item **ref, Item *cmp_item); -extern int stored_field_cmp_to_item(Field *field, Item *item); +extern int stored_field_cmp_to_item(THD *thd, Field *field, Item *item); #endif /* ITEM_INCLUDED */ |