diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-06-07 18:13:02 +0200 |
| commit | 9b98cae4cc44fa39813675b361b7aa65d129b29d (patch) | |
| tree | 7f4baeea245f91006e88c62508c2859ed9390c2d /sql/item_cmpfunc.h | |
| parent | 29af1aefe914da6aca73498c077f7e37a36d7de4 (diff) | |
| parent | 4d128777dde904c5f0adab9b093e854c9c580d41 (diff) | |
| download | mariadb-git-9b98cae4cc44fa39813675b361b7aa65d129b29d.tar.gz | |
merge with 5.1-micro
Diffstat (limited to 'sql/item_cmpfunc.h')
| -rw-r--r-- | sql/item_cmpfunc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index c6d2e929530..281fd7b7ded 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -972,7 +972,8 @@ public: virtual int cmp(Item *item)= 0; // for optimized IN with row virtual int compare(cmp_item *item)= 0; - static cmp_item* get_comparator(Item_result type, CHARSET_INFO *cs); + static cmp_item* get_comparator(Item_result type, Item * warn_item, + CHARSET_INFO *cs); virtual cmp_item *make_same()= 0; virtual void store_value_by_template(cmp_item *tmpl, Item *item) { @@ -1168,7 +1169,7 @@ class Item_func_case :public Item_func Item_result cmp_type; DTCollation cmp_collation; enum_field_types cached_field_type; - cmp_item *cmp_items[5]; /* For all result types */ + cmp_item *cmp_items[6]; /* For all result types */ cmp_item *case_item; public: Item_func_case(List<Item> &list, Item *first_expr_arg, Item *else_expr_arg) @@ -1258,7 +1259,7 @@ public: Item_int_func::cleanup(); delete array; array= 0; - for (i= 0; i <= (uint)DECIMAL_RESULT + 1; i++) + for (i= 0; i <= (uint)TIME_RESULT; i++) { delete cmp_items[i]; cmp_items[i]= 0; |