From d3905f3d0eb8c2fcbebbecceeca348f2add2cb0d Mon Sep 17 00:00:00 2001 From: "bell@sanja.is.com.ua" <> Date: Fri, 1 Jul 2005 07:05:42 +0300 Subject: Name resolution context added (BUG#6443) --- sql/item_strfunc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sql/item_strfunc.h') diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index c4beb3b08cb..b8696895047 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -415,12 +415,12 @@ class Item_func_make_set :public Item_str_func public: Item_func_make_set(Item *a,List &list) :Item_str_func(list),item(a) {} String *val_str(String *str); - bool fix_fields(THD *thd, TABLE_LIST *tlist, Item **ref) + bool fix_fields(THD *thd, Item **ref) { DBUG_ASSERT(fixed == 0); - return ((!item->fixed && item->fix_fields(thd, tlist, &item)) || + return ((!item->fixed && item->fix_fields(thd, &item)) || item->check_cols(1) || - Item_func::fix_fields(thd, tlist, ref)); + Item_func::fix_fields(thd, ref)); } void split_sum_func(THD *thd, Item **ref_pointer_array, List &fields); void fix_length_and_dec(); -- cgit v1.2.1