From a5087248e30123ed7cbd18ab3ab7889f21c9a726 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Oct 2004 11:43:31 +0500 Subject: An extra "separator" class member was removed from Item_func_concat_ws. args[0] is now used instead. --- sql/item_strfunc.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'sql/item_strfunc.h') diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 77c1caec9fc..afe03c31345 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -89,30 +89,12 @@ public: class Item_func_concat_ws :public Item_str_func { - Item *separator; String tmp_value; - public: - Item_func_concat_ws(Item *a,List &list) - :Item_str_func(list),separator(a) {} + Item_func_concat_ws(List &list) :Item_str_func(list) {} String *val_str(String *); void fix_length_and_dec(); - void update_used_tables(); - bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) - { - DBUG_ASSERT(fixed == 0); - return (separator->fix_fields(thd, tlist, &separator) || - separator->check_cols(1) || - Item_func::fix_fields(thd, tlist, ref)); - } - void split_sum_func(THD *thd, Item **ref_pointer_array, List &fields); const char *func_name() const { return "concat_ws"; } - bool walk(Item_processor processor, byte *arg) - { - return separator->walk(processor, arg) || - Item_str_func::walk(processor, arg); - } - void print(String *str); }; class Item_func_reverse :public Item_str_func -- cgit v1.2.1