diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-08-27 15:59:25 +0500 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2009-08-27 15:59:25 +0500 |
| commit | 51f4ccfa43b8233227ca0257a293f41b2153e42b (patch) | |
| tree | 6c51e017537127fec10e4295a85aed40e987d52d /sql | |
| parent | 1759f9ecb4a8ba67804410a8902c00ebbe12545a (diff) | |
| parent | 367c14b854f4afe6cfd41b9f56bf8fbf3c337b65 (diff) | |
| download | mariadb-git-51f4ccfa43b8233227ca0257a293f41b2153e42b.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_yacc.yy | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 4ed9946a334..c7e955d122d 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9075,7 +9075,8 @@ procedure_clause: MYSQL_YYABORT; } - if (&lex->select_lex != lex->current_select) + if (&lex->select_lex != lex->current_select || + lex->select_lex.get_table_list()->derived) { my_error(ER_WRONG_USAGE, MYF(0), "PROCEDURE", "subquery"); MYSQL_YYABORT; |