Added check for selects without into in SPs, and updated error messages and tests

accordingly.


include/mysqld_error.h:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/czech/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/danish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/dutch/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/english/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/estonian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/french/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/german/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/greek/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/hungarian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/italian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/japanese/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/korean/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/norwegian-ny/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/norwegian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/polish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/portuguese/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/romanian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/russian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/serbian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/slovak/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/spanish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/swedish/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
sql/share/ukrainian/errmsg.txt:
  Added bad select in SP error (and fixed leave/iterate label mismatch error).
mysql-test/r/sp.result:
  New test for repeat(...) and select with and without into in SPs.
mysql-test/t/sp.test:
  New test for repeat(...) and select with and without into in SPs.
sql/sql_yacc.yy:
  Check if an SP substatement is a SELECT and if so, has an INTO. If not, it's an
  error.

23 files changed, 68 insertions, 68 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 79dae19dbc8..dd2df4c5243 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -264,9 +264,9 @@ v/*
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index a77c2b59622..3c66c5a64f2 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -258,9 +258,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 5f78ba6c21d..cdae9092602 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -266,9 +266,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 9fe52f075dc..811fb015fb7 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -256,8 +256,8 @@
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
 "Failed to CREATE PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 8202d782408..af32e4cc630 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -260,9 +260,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 799cb76d8c0..147948d567f 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index d6c9a2fb8ed..c3b4713241a 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -265,9 +265,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index c78d410df83..43ba3c3b173 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index b42c4a87c4f..9355daa634e 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -257,9 +257,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 937f2d41379..aee2c229f80 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 136e4c77fb6..2b7515c12d1 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -257,9 +257,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 08c496984a8..b8e0e7a4f25 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 7c7387da2fe..15894decc4a 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -257,9 +257,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index fc42860af0d..01ce52ec060 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -257,9 +257,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index f907222ea28..a2440d5928e 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -259,9 +259,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index a26d6dae971..86b44f4d97d 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index e2ac7eade01..f6cc343a70d 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -259,9 +259,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 8d350e62f00..33dc4e5d3b8 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -258,9 +258,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index e12c2953805..eb699fc812c 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -251,9 +251,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 391b531cfdb..b1253642081 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -263,9 +263,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 528c89893cc..6be74571317 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -256,9 +256,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index e8f1d4eec0f..512314cf856 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -255,9 +255,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index 965da3cd29d..337157829a9 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -260,9 +260,9 @@
 "PROCEDURE already exists"
 "PROCEDURE does not exist"
 "Failed to DROP PROCEDURE"
-"Failed to store PROCEDURE"
-"LEAVE with no matching label"
-"ITERATE with no matching label"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
 "Redefining label"
 "End-label without match"
 "Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"