Fixed BUG#336: Subselects with tables does not work as values for local SP variables

 and BUG#1654: Stored Procedure Crash if contains subquery and set function

Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
The latter should work, but turned out to be difficult to fix, so we just
disallow it for the time being.


include/mysqld_error.h:
  New error message for unsupported subselect as SP set values (for the time being).
include/sql_state.h:
  New error message for unsupported subselect as SP set values (for the time being).
mysql-test/r/sp-error.result:
  Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
mysql-test/t/sp-error.test:
  Test cases for BUG#336 and BUG#1654. (Unsupported use of subselect)
sql/item.cc:
  Made Item_splocal::type() work at compile time, for error checking.
sql/item.h:
  Made Item_splocal::type() work at compile time, for error checking.
sql/share/czech/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/danish/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/dutch/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/english/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/estonian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/french/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/german/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/greek/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/hungarian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/italian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/japanese/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/korean/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/norwegian-ny/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/norwegian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/polish/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/portuguese/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/romanian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/russian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/serbian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/slovak/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/spanish/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/swedish/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/share/ukrainian/errmsg.txt:
  New error message for unsupported subselect as SP set values (for the time being).
sql/sp_head.cc:
  Fixed (bogus) compile error on HP-UX alpha.
sql/sql_yacc.yy:
  Disallowed subselects in RETURN (for FUNCTIONs) and SET of local variables.
  The latter should work, but turned out to be difficult to fix, so we just
  disallow it for the time being.

23 files changed, 23 insertions, 0 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 5cf1dd2a47c..76c936019a0 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -329,3 +329,4 @@ character-set=latin2
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 69e14c6acf3..6bacfe53b2c 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -323,3 +323,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 386ff34ef59..f45fc31b293 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -331,3 +331,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 2e159d40e40..f68d65467bb 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -320,3 +320,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index e03f60ac040..12e33f48b31 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -325,3 +325,4 @@ character-set=latin7
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index b3591e2f4ab..92c831604d3 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -320,3 +320,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 6a404b2083f..fcd8028863a 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -332,3 +332,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index 47cb5125dbb..e5ac5e872ce 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -320,3 +320,4 @@ character-set=greek
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index cbe34d19fe1..ace96dd1420 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -322,3 +322,4 @@ character-set=latin2
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index 6f7aaaec669..9b4b6f8c601 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -320,3 +320,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index ee9a546cb11..53d39211378 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -322,3 +322,4 @@ character-set=ujis
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index 6aa94a4482a..1abf59b2456 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -320,3 +320,4 @@ character-set=euckr
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 65faac4365c..2f14cdcc042 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -322,3 +322,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 26d0bae406f..d086345f97b 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -322,3 +322,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 55e3d9dc1dc..c0333f2b643 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -324,3 +324,4 @@ character-set=latin2
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 519434c24b5..1c307d60b25 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -321,3 +321,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 5c6ecd8ddd7..4bb0dd981ae 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -324,3 +324,4 @@ character-set=latin2
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index 6f0dd2d9ac7..7aab4d23f44 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -322,3 +322,4 @@ character-set=koi8r
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/serbian/errmsg.txt b/sql/share/serbian/errmsg.txt
index e9be8102e0e..f32593c6441 100644
--- a/sql/share/serbian/errmsg.txt
+++ b/sql/share/serbian/errmsg.txt
@@ -315,3 +315,4 @@ character-set=cp1250
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index af3eae4f97b..6dccde95e25 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -328,3 +328,4 @@ character-set=latin2
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index b799ce54bec..dcadd07e73e 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -322,3 +322,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 40fc31dfdb3..8189d43fdbb 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -320,3 +320,4 @@ character-set=latin1
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"
diff --git a/sql/share/ukrainian/errmsg.txt b/sql/share/ukrainian/errmsg.txt
index e0d42d6264b..c95fd62e104 100644
--- a/sql/share/ukrainian/errmsg.txt
+++ b/sql/share/ukrainian/errmsg.txt
@@ -325,3 +325,4 @@ character-set=koi8u
 "Duplicate condition: %s"
 "Duplicate cursor: %s"
 "Failed to ALTER %s %s"
+"Subselect value not supported"