1 files changed, 48 insertions, 0 deletions
diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index 71b2b91ccb1..f8abab0e7e3 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -103,6 +103,42 @@ create procedure foo()
 begin
   goto foo;
 end|
+--error 1307
+create procedure foo()
+begin
+  begin
+    label foo;
+  end;
+  goto foo;
+end|
+--error 1307
+create procedure foo()
+begin
+  goto foo;
+  begin
+    label foo;
+  end;
+end|
+--error 1307
+create procedure foo()
+begin
+  begin
+    goto foo;
+  end;
+  begin
+    label foo;
+  end;
+end|
+--error 1307
+create procedure foo()
+begin
+  begin
+    label foo;
+  end;
+  begin
+    goto foo;
+  end;
+end|
 
 # Redefining label
 --error 1308
@@ -380,6 +416,18 @@ begin
   declare c cursor for select * from t1;
 end|
 
+--error 1357
+create procedure p()
+begin
+  declare continue handler for sqlexception
+    begin
+      goto L1;
+    end;
+
+  select field from t1;
+  label L1;
+end|
+
 #
 # BUG#1965
 #