diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2016-02-25 14:55:04 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2016-05-28 14:44:21 +0200 |
commit | 7166069537a4e18d4c0848655fcbc0c8ee568fd4 (patch) | |
tree | d07e24b3ce97d2b70583f3273eb1dfc4f438936e /sql/sql_yacc.yy | |
parent | 1f89ea8ea049909228c441d125a2b13348ec56af (diff) | |
download | mariadb-git-7166069537a4e18d4c0848655fcbc0c8ee568fd4.tar.gz |
MDEV-3944: Allow derived tables in VIEWS
Diffstat (limited to 'sql/sql_yacc.yy')
-rw-r--r-- | sql/sql_yacc.yy | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 37a543aef53..1aa6b07adeb 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -11373,11 +11373,6 @@ get_select_lex_derived: select_derived_init: { LEX *lex= Lex; - if (! lex->parsing_options.allows_derived) - { - my_error(ER_VIEW_SELECT_DERIVED, MYF(0)); - MYSQL_YYABORT; - } TABLE_LIST *embedding= lex->current_select->embedding; $$= embedding && @@ -16745,7 +16740,6 @@ view_select: { LEX *lex= Lex; lex->parsing_options.allows_variable= FALSE; - lex->parsing_options.allows_derived= FALSE; lex->create_view_select.str= (char *) YYLIP->get_cpp_ptr(); } opt_with_clause query_expression_body_view view_check_option @@ -16757,7 +16751,6 @@ view_select: lex->create_view_select.str= (char *) create_view_select; trim_whitespace(thd->charset(), &lex->create_view_select); lex->parsing_options.allows_variable= TRUE; - lex->parsing_options.allows_derived= TRUE; lex->current_select->set_with_clause($2); } ; |