bk commit into 5.0 tree (acurtis:1.1871)

[antony]

Below is the list of changes that have just been committed into a local
5.0 repository of acurtis. When acurtis 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.1871 05/04/21 13:34:39 acurtis@stripped +5 -0
  Merge

  mysql-test/t/sp.test
    1.113 05/04/21 13:34:27 acurtis@stripped +16 -16
    Merge

  mysql-test/r/sp.result
    1.118 05/04/21 13:34:27 acurtis@stripped +0 -0
    Merge

  sql/sql_yacc.yy
    1.366 05/04/21 13:27:21 acurtis@stripped +0 -0
    Auto merged

  sql/sp_head.cc
    1.129 05/04/21 13:27:20 acurtis@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.290 05/04/21 13:27:20 acurtis@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:	acurtis
# Host:	ltantony.xiphis.org
# Root:	/.amd_mnt/bk.anubis/host/work-acurtis/bug9102/RESYNC

--- 1.365/sql/sql_yacc.yy	2005-04-19 09:09:12 +01:00
+++ 1.366/sql/sql_yacc.yy	2005-04-21 13:27:21 +01:00
@@ -3315,6 +3315,11 @@
 	  {
 	    LEX *lex= Lex;
 
+	    if (lex->sphead)
+	    {
+	      my_error(ER_SP_NO_DROP_SP, MYF(0), "PROCEDURE");
+	      YYABORT;
+	    }
 	    bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
           }
 	  sp_a_chistics
@@ -3328,6 +3333,11 @@
 	  {
 	    LEX *lex= Lex;
 
+	    if (lex->sphead)
+	    {
+	      my_error(ER_SP_NO_DROP_SP, MYF(0), "FUNCTION");
+	      YYABORT;
+	    }
 	    bzero((char *)&lex->sp_chistics, sizeof(st_sp_chistics));
           }
 	  sp_a_chistics

--- 1.117/mysql-test/r/sp.result	2005-04-21 13:22:31 +01:00
+++ 1.118/mysql-test/r/sp.result	2005-04-21 13:34:27 +01:00
@@ -2958,6 +2958,15 @@
 set global query_cache_size = @qcs1|
 delete from t1|
 drop function bug9902|
+drop procedure if exists bug6898|
+create procedure bug6898()
+begin
+goto label1;
+label label1;
+begin end;
+goto label1;
+end|
+drop procedure bug6898|
 drop function if exists bug9102|
 create function bug9102() returns blob return 'a'|
 select bug9102()|

--- 1.112/mysql-test/t/sp.test	2005-04-21 13:22:31 +01:00
+++ 1.113/mysql-test/t/sp.test	2005-04-21 13:34:27 +01:00
@@ -3629,6 +3629,22 @@
 
 
 #
+# BUG#6898: Stored procedure crash if GOTO statements exist
+#
+--disable_warnings
+drop procedure if exists bug6898|
+--enable_warnings
+create procedure bug6898()
+begin
+  goto label1;
+  label label1;
+  begin end;
+  goto label1;
+end|
+drop procedure bug6898|
+
+
+#
 # BUG#9102: Stored proccedures: function which returns blob causes crash
 #
 --disable_warnings

--- 1.128/sql/sp_head.cc	2005-04-20 18:08:28 +01:00
+++ 1.129/sql/sp_head.cc	2005-04-21 13:27:20 +01:00
@@ -1527,7 +1527,7 @@
   {
     uint ndest;
 
-    if (start == i)
+    if (start == i || this == i)
       break;
     ndest= i->opt_shortcut_jump(sp, start);
     if (ndest == dest)