bk commit into 5.0 tree (monty:1.1918)

[monty]

Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1918 05/06/06 14:36:21 monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sp_rcontext.cc
    1.28 05/06/06 14:36:19 monty@stripped +0 -0
    Auto merged

  sql/sp_head.cc
    1.143 05/06/06 14:36:19 monty@stripped +0 -0
    Auto merged

# 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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.142/sql/sp_head.cc	2005-06-05 17:19:13 +03:00
+++ 1.143/sql/sp_head.cc	2005-06-06 14:36:19 +03:00
@@ -1903,32 +1903,32 @@
   else
   {
     sp_lex_keeper *lex_keeper= c->pre_open(thd);
-
-    if (!lex_keeper)
+    if (!lex_keeper)                            // cursor already open or OOM
     {
       res= -1;
       *nextp= m_ip+1;
     }
     else
-      res= lex_keeper->reset_lex_and_exec_core(thd, nextp, FALSE, this);
-
-    /*
-      Work around the fact that errors in selects are not returned properly
-      (but instead converted into a warning), so if a condition handler
-      caught, we have lost the result code.
-     */
-    if (!res)
     {
-      uint dummy1, dummy2;
+      res= lex_keeper->reset_lex_and_exec_core(thd, nextp, FALSE, this);
+      /*
+        Work around the fact that errors in selects are not returned properly
+        (but instead converted into a warning), so if a condition handler
+        caught, we have lost the result code.
+       */
+      if (!res)
+      {
+        uint dummy1, dummy2;
 
-      if (thd->spcont->found_handler(&dummy1, &dummy2))
-	res= -1;
+        if (thd->spcont->found_handler(&dummy1, &dummy2))
+  	  res= -1;
+      }
+      c->post_open(thd, res ? FALSE : TRUE);
     }
-    c->post_open(thd, (lex_keeper && !res ? TRUE : FALSE));
   }
-
   DBUG_RETURN(res);
 }
+
 
 int
 sp_instr_copen::exec_core(THD *thd, uint *nextp)

--- 1.27/sql/sp_rcontext.cc	2005-06-05 17:01:07 +03:00
+++ 1.28/sql/sp_rcontext.cc	2005-06-06 14:36:19 +03:00
@@ -14,6 +14,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+#include "mysql_priv.h"
 #ifdef USE_PRAGMA_IMPLEMENTATION
 #pragma implementation
 #endif
@@ -22,7 +23,6 @@
 #undef SAFEMALLOC				/* Problems with threads */
 #endif
 
-#include "mysql_priv.h"
 #include "mysql.h"
 #include "sp_head.h"
 #include "sp_rcontext.h"