Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836
into rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-4.1-maint
This commit is contained in:
commit
40aba03eda
@ -1746,14 +1746,6 @@ bool select_dumpvar::send_data(List<Item> &items)
|
|||||||
while ((ls= var_li++) && (item= it++))
|
while ((ls= var_li++) && (item= it++))
|
||||||
{
|
{
|
||||||
Item_func_set_user_var *suv= new Item_func_set_user_var(*ls, item);
|
Item_func_set_user_var *suv= new Item_func_set_user_var(*ls, 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, (TABLE_LIST *) thd->lex->select_lex.table_list.first,
|
suv->fix_fields(thd, (TABLE_LIST *) thd->lex->select_lex.table_list.first,
|
||||||
0);
|
0);
|
||||||
suv->check();
|
suv->check();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user