summaryrefslogtreecommitdiff
path: root/mysql-test/r/sp-error.result
diff options
context:
space:
mode:
authorunknown <andrey@lmy004.>2005-08-29 12:19:08 +0200
committerunknown <andrey@lmy004.>2005-08-29 12:19:08 +0200
commitafe5507c751bae8ce0726a1888c4d14407089c53 (patch)
tree0a29b6e1ba33dd436555139959f529c683362952 /mysql-test/r/sp-error.result
parentb224e52c996719150f2079e35661dfb7e4fb7e7a (diff)
downloadmariadb-git-afe5507c751bae8ce0726a1888c4d14407089c53.tar.gz
fix for bug #12490 (all-in-one patch)
(Packets out of order if calling HELP CONTENTS from Stored Procedure) mysql-test/r/sp-error.result: results of test of bug 12490 mysql-test/t/sp-error.test: test for bug 12490 (Packets out of order if calling HELP CONTENTS from Stored Procedure) sql/sql_yacc.yy: disable HELP in SP (fixes bug 12490)
Diffstat (limited to 'mysql-test/r/sp-error.result')
-rw-r--r--mysql-test/r/sp-error.result8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 4ac29a07757..23644f57353 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -748,6 +748,14 @@ end|
call bug11394(2, 1)|
ERROR HY000: Recursive stored routines are not allowed.
drop procedure bug11394|
+CREATE PROCEDURE BUG_12490() HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+CREATE FUNCTION BUG_12490() RETURNS INT HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+CREATE TABLE t_bug_12490(a int);
+CREATE TRIGGER BUG_12490 BEFORE UPDATE ON t_bug_12490 FOR EACH ROW HELP CONTENTS;
+ERROR 0A000: HELP is not allowed in stored procedures
+DROP TABLE t_bug_12490;
drop function if exists bug11834_1;
drop function if exists bug11834_2;
create function bug11834_1() returns int return 10;