diff options
| author | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 14:50:03 +0300 |
|---|---|---|
| committer | Sergey Glukhov <sergey.glukhov@oracle.com> | 2010-12-21 14:50:03 +0300 |
| commit | 41f17a87074eeeb173ce3b75c4293fabdade8aae (patch) | |
| tree | 0494999be141ccd9f626e86427b958c8116e2cd6 /sql/item_sum.h | |
| parent | c37ad60ef1eafa7ef52164422ee49b4a35c72d8b (diff) | |
| parent | e2db8e6ccb2655ec5706305b491540ad3f1c8267 (diff) | |
| download | mariadb-git-41f17a87074eeeb173ce3b75c4293fabdade8aae.tar.gz | |
5.1-bugteam->5.5-bugteam merge
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index 3ea79fb8cee..634d593935f 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -994,7 +994,7 @@ class Item_cache; class Item_sum_hybrid :public Item_sum { protected: - Item_cache *value; + Item_cache *value, *arg_cache; Arg_comparator *cmp; Item_result hybrid_type; enum_field_types hybrid_field_type; @@ -1003,14 +1003,14 @@ protected: public: Item_sum_hybrid(Item *item_par,int sign) - :Item_sum(item_par), value(0), cmp(0), + :Item_sum(item_par), value(0), arg_cache(0), cmp(0), hybrid_type(INT_RESULT), hybrid_field_type(MYSQL_TYPE_LONGLONG), cmp_sign(sign), was_values(TRUE) { collation.set(&my_charset_bin); } Item_sum_hybrid(THD *thd, Item_sum_hybrid *item) - :Item_sum(thd, item), value(item->value), hybrid_type(item->hybrid_type), - hybrid_field_type(item->hybrid_field_type), cmp_sign(item->cmp_sign), - was_values(item->was_values) + :Item_sum(thd, item), value(item->value), arg_cache(0), + hybrid_type(item->hybrid_type), hybrid_field_type(item->hybrid_field_type), + cmp_sign(item->cmp_sign), was_values(item->was_values) { } bool fix_fields(THD *, Item **); void setup_hybrid(Item *item, Item *value_arg); |