bk commit into 5.0 tree (sergefp:1.1878) BUG#9814

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
5.0 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1878 05/07/04 23:40:01 sergefp@stripped +1 -0
  BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction
    execution, not before.

  sql/sp_head.cc
    1.156 05/07/04 23:39:57 sergefp@stripped +4 -4
    BUG#9814: post-review fixes: clear thd->net.no_send error after SP instruction
      execution, not before.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-5.0-jul4

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