Major rehacking and cleanup of sp_pcontext.

This finishes (almost) WL#2002: Implement stored procedure GOTO.
Only the syntax issue for free labels remains ("label L;" vs "L:").


include/mysqld_error.h:
  New error code for GOTO in SP handler.
mysql-test/r/sp-error.result:
  New error test cases for GOTO.
mysql-test/r/sp.result:
  New test cases for GOTO.
  Also removed some things that made it impossible to run the test in
  an external (debugged) mysqld.
mysql-test/t/sp-error.test:
  New error test cases for GOTO.
mysql-test/t/sp.test:
  New test cases for GOTO.
  Also removed some things that made it impossible to run the test in
  an external (debugged) mysqld.
sql/share/czech/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/danish/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/dutch/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/english/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/estonian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/french/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/german/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/greek/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/hungarian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/italian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/japanese/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/korean/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/norwegian-ny/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/norwegian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/polish/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/portuguese/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/romanian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/russian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/serbian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/slovak/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/spanish/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/swedish/errmsg.txt:
  New error message for GOTO in SP handler.
sql/share/ukrainian/errmsg.txt:
  New error message for GOTO in SP handler.
sql/sp_head.cc:
  Code cleanup (renaming of pcontext methods), support goto, and fixed bug
  in jump shortcutting in the optimizer (detect infinite loops).
sql/sp_head.h:
  Code cleanup (renaming of pcontext methods), support goto, and fixed bug
  in jump shortcutting in the optimizer (detect infinite loops).
sql/sp_pcontext.cc:
  Major rehack and cleanup:
  - We now push and pop a chain of contexts during parsing (instead of having
    a single one).
  - Makes error detection for GOTO easier and enables some optmizations and
    debugger support.
  - Makes it a little trickier to keep track on variable and cursor indexes instead.
  - Renamed things to get a more consistent naming scheme too.
sql/sp_pcontext.h:
  Major rehack and cleanup:
  - We now push and pop a chain of contexts during parsing (instead of having
    a single one).
  - Makes error detection for GOTO easier and enables some optmizations and
    debugger support.
  - Makes it a little trickier to keep track on variable and cursor indexes instead.
  - Renamed things to get a more consistent naming scheme too.
sql/sql_yacc.yy:
  Changes to reflect the rework and renamings in sp_pcontext, and fixed
  some GOTO error checking.

23 files changed, 23 insertions, 0 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 264bc38117a..9d1c429d5b6 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -369,3 +369,4 @@ character-set=latin2
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index c0f915e0b53..b2d2fdf4d77 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -363,3 +363,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 9bfca16ad54..85c0443869f 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -371,3 +371,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index c159e6b49c7..641f267d67e 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -360,3 +360,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 4c679a2967a..e64c0c17e74 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -365,3 +365,4 @@ character-set=latin7
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 2f8cccbc6fb..f3443457346 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -360,3 +360,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index dc18cfa9b34..498a230faed 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -372,3 +372,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index b8cbe9b5a75..2827517ba9a 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -360,3 +360,4 @@ character-set=greek
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index b7cc9fe34d7..fab0b156322 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -362,3 +362,4 @@ character-set=latin2
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 0c9576cab47..24634514a23 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -360,3 +360,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index d5ef9f22a56..68f2857aeca 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -362,3 +362,4 @@ character-set=ujis
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 4f03bedc717..70267c82364 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -360,3 +360,4 @@ character-set=euckr
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 821453e6119..1d84a3a5e5a 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -362,3 +362,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 5a60042b19e..be881d54473 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -362,3 +362,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 2f9f5b4bbce..8a576b5bf82 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -364,3 +364,4 @@ character-set=latin2
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 2a32c80138b..6794db726cc 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -361,3 +361,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 211a0072934..9eaa4860b64 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -364,3 +364,4 @@ character-set=latin2
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 907cece485f..eec85d611fc 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -362,3 +362,4 @@ character-set=koi8r
 "Обновляемый view не содержит ключа использованной в нем таблиц(ы)"
 "View '%-.64s.%-.64s' ссылается на несуществующие таблицы или слолбцы"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index 5b74999a3cd..4039268f446 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -366,3 +366,4 @@ character-set=cp1250
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 5d7fce940e2..9be5ce01d6a 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -368,3 +368,4 @@ character-set=latin2
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 570da612be9..dc15f8b8d5e 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -362,3 +362,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 4e97393b0b1..ee5436c3b80 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -360,3 +360,4 @@ character-set=latin1
 "View being updated does not have complete key of underlying table in it"
 "View '%-.64s.%-.64s' references invalid table(s) or column(s)"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index a043b6eb651..cb1d99e2fec 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -365,3 +365,4 @@ character-set=koi8u
 "View, що оновлюеться, не м╕стить повного ключа таблиц╕(ь), що викор╕стана в ньюому"
 "View '%-.64s.%-.64s' посила╓тся на не╕снуюч╕ таблиц╕ або стовбц╕"
 "Can't drop a %s from within another stored routine"
+"GOTO is not allowed in a stored procedure handler"