Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-merges sql/sp_head.cc: Auto merged
This commit is contained in:
commit
ae2377c407
@ -1518,8 +1518,8 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
|
|||||||
Item_func_set_user_var is not fixed after construction,
|
Item_func_set_user_var is not fixed after construction,
|
||||||
call fix_fields().
|
call fix_fields().
|
||||||
*/
|
*/
|
||||||
if ((ret= test(!suv || suv->fix_fields(thd, &item) ||
|
if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||
|
||||||
suv->check() || suv->update())))
|
suv->check() || suv->update())))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user