diff options
| author | unknown <andrey@lmy004.> | 2005-08-29 12:19:08 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2005-08-29 12:19:08 +0200 |
| commit | afe5507c751bae8ce0726a1888c4d14407089c53 (patch) | |
| tree | 0a29b6e1ba33dd436555139959f529c683362952 /sql/sql_yacc.yy | |
| parent | b224e52c996719150f2079e35661dfb7e4fb7e7a (diff) | |
| download | mariadb-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 'sql/sql_yacc.yy')
| -rw-r--r-- | sql/sql_yacc.yy | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 6b447396dec..c1f4236604a 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -1016,11 +1016,19 @@ execute_var_ident: '@' ident_or_text /* help */ help: - HELP_SYM ident_or_text + HELP_SYM + { + if (Lex->sphead) + { + my_error(ER_SP_BADSTATEMENT, MYF(0), "HELP"); + YYABORT; + } + } + ident_or_text { LEX *lex= Lex; lex->sql_command= SQLCOM_HELP; - lex->help_arg= $2.str; + lex->help_arg= $3.str; }; /* change master */ |