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:
unknown 2005-12-07 21:21:54 +03:00
commit ae2377c407

View File

@ -1518,8 +1518,8 @@ sp_head::execute_procedure(THD *thd, List<Item> *args)
Item_func_set_user_var is not fixed after construction,
call fix_fields().
*/
if ((ret= test(!suv || suv->fix_fields(thd, &item) ||
suv->check() || suv->update())))
if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||
suv->check() || suv->update())))
break;
}
}