Commit ae2377c4 authored by unknown's avatar unknown
Browse files

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
parents 4da61404 5213f589

sql/sp_head.cc

+2 −2
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ 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) ||

          if ((err_status= test(!suv || suv->fix_fields(thd, &item) ||

                                suv->check() || suv->update())))

            break;

	}