Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my51-bug20836

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.1-maint


sql/sql_class.cc:
  Auto merged
This commit is contained in:
unknown 2006-12-05 10:32:16 -05:00
commit 3149347c1d

View file

@ -1962,14 +1962,6 @@ bool select_dumpvar::send_data(List<Item> &items)
else else
{ {
Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item); Item_func_set_user_var *suv= new Item_func_set_user_var(mv->s, item);
/*
Item_func_set_user_var can't substitute something else on its
place => NULL may be passed as last argument (reference on
item) Item_func_set_user_var can't be fixed after creation, so
we do not check var->fixed
*/
suv->fix_fields(thd, 0); suv->fix_fields(thd, 0);
suv->check(0); suv->check(0);
suv->update(); suv->update();