summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorpem@mysql.comhem.se <>2005-04-26 17:31:59 +0200
committerpem@mysql.comhem.se <>2005-04-26 17:31:59 +0200
commit281c0a813006aa5cc56610b46962d68856452ef1 (patch)
tree3e1d843329a69cf864b698ec0a864fa22df608ab /sql/share
parentb890c05b4dd3461879a30da3b9cbf44e8f7b6040 (diff)
downloadmariadb-git-281c0a813006aa5cc56610b46962d68856452ef1.tar.gz
Fixed BUG#8408: Stored procedure crash if function contains SHOW
We simply have to disallow any kind of result set being sent back from a function. Can't see any way to make that to work.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 8d7a1fe0093..66986a884b3 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -5342,3 +5342,5 @@ ER_SP_DUP_HANDLER 42000
eng "Duplicate handler declared in the same block"
ER_SP_NOT_VAR_ARG 42000
eng "OUT or INOUT argument %d for routine %s is not a variable"
+ER_SP_NO_RETSET_IN_FUNC 0A000
+ eng "Not allowed to return a result set from a function"