1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction

Browse Source 
execution, not before.
This commit is contained in:
sergefp@mysql.com 2005-07-04 23:40:01 +00:00
parent 4a90f7d04f
commit 3d5d366c72
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sp_head.cc
View File

@ -642,13 +642,13 @@ sp_head::execute(THD *thd)
items made during other permanent subquery transformations). items made during other permanent subquery transformations).
*/ */
thd->current_arena= i; thd->current_arena= i;
ret= i->execute(thd, &ip);
/* /*
no_send_error may have been set by the previous SP instruction when it If this SP instruction have sent eof, it has caused no_send_error to be
sent eof. Allow the current SP instruction to produce an error. set. Clear it back to allow the next instruction to send error. (multi-
(multi-statement execution code clears no_send_error, too) statement execution code clears no_send_error between statements too)
*/ */
thd->net.no_send_error= 0; thd->net.no_send_error= 0;
ret= i->execute(thd, &ip);
if (i->free_list) if (i->free_list)
cleanup_items(i->free_list); cleanup_items(i->free_list);
i->state= Query_arena::EXECUTED; i->state= Query_arena::EXECUTED;