Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836 sql/sql_class.cc: manual merge
This commit is contained in:
commit
784f0aab0c
@ -1859,14 +1859,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();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user