diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:06:26 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-10-12 18:06:26 +0400 |
| commit | 8acc9a961211fe96f5a57e5c9fad4cbc0af61445 (patch) | |
| tree | 9bb710317c1d7551d4796293a97bbbf53950debb /sql/sql_view.cc | |
| parent | aef96fd0a546b4ac185abd5bd7208d72e0a0cbe7 (diff) | |
| parent | 6d1fdc7308d73c439d7a2da6851199939cde93f4 (diff) | |
| download | mariadb-git-8acc9a961211fe96f5a57e5c9fad4cbc0af61445.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug20953
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-bug20953
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/sp-error.result:
Manual merge.
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 7f6d935ff5e..ca747fec3a0 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -236,25 +236,9 @@ bool mysql_create_view(THD *thd, bool res= FALSE; DBUG_ENTER("mysql_create_view"); - if (lex->proc_list.first || - lex->result) - { - my_error(ER_VIEW_SELECT_CLAUSE, MYF(0), (lex->result ? - "INTO" : - "PROCEDURE")); - res= TRUE; - goto err; - } - if (lex->derived_tables || - lex->variables_used || lex->param_list.elements) - { - int err= (lex->derived_tables ? - ER_VIEW_SELECT_DERIVED : - ER_VIEW_SELECT_VARIABLE); - my_message(err, ER(err), MYF(0)); - res= TRUE; - goto err; - } + /* This is ensured in the parser. */ + DBUG_ASSERT(!lex->proc_list.first && !lex->result && + !lex->param_list.elements && !lex->derived_tables); if (mode != VIEW_CREATE_NEW) { |