diff options
| author | unknown <davi@buzz.(none)> | 2008-02-21 23:58:45 -0200 |
|---|---|---|
| committer | unknown <davi@buzz.(none)> | 2008-02-21 23:58:45 -0200 |
| commit | 3676f5188e93a824956dc43c9122904498522ffa (patch) | |
| tree | 58f450f841c0d24e21d2151ec112ad90beec9818 /sql/sql_view.cc | |
| parent | 955b3e3d0b691890db89d4049fc14348dcb1c183 (diff) | |
| download | mariadb-git-3676f5188e93a824956dc43c9122904498522ffa.tar.gz | |
Post-merge fixes for bug 32890
mysql-test/r/ps.result:
Update test case results
sql/item.h:
Manual merge
sql/sql_view.cc:
Manual merge
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 92cf3529d2f..608c7a9eaa8 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -351,7 +351,7 @@ bool create_view_precheck(THD *thd, TABLE_LIST *tables, TABLE_LIST *view, res= FALSE; err: - DBUG_RETURN(res || thd->net.report_error); + DBUG_RETURN(res || thd->is_error()); } #else @@ -397,7 +397,7 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views, /* This is ensured in the parser. */ DBUG_ASSERT(!lex->proc_list.first && !lex->result && - !lex->param_list.elements && !lex->derived_tables); + !lex->param_list.elements); if (mode != VIEW_CREATE_NEW) { |