diff options
| author | unknown <davi@endora.local> | 2008-02-20 17:30:12 -0300 |
|---|---|---|
| committer | unknown <davi@endora.local> | 2008-02-20 17:30:12 -0300 |
| commit | 25ac83c0a90814b83b7d97bfef4cb8ca4aab08e3 (patch) | |
| tree | 9bce385e54961b83c5be0da697c0e2574621bb94 /sql/sql_view.cc | |
| parent | 985e9523479fb1143ac60e1644613d34e126ef58 (diff) | |
| parent | 43717ba1d118c09e9398f34ae36307254664f4ba (diff) | |
| download | mariadb-git-25ac83c0a90814b83b7d97bfef4cb8ca4aab08e3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/Users/davi/mysql/mysql-5.1-runtime
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_view.cc:
Auto merged
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 0642a2d2e17..f1eb0004577 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -260,7 +260,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) { @@ -741,11 +741,7 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, /* fill structure */ view->select_stmt.str= view_query.c_ptr_safe(); view->select_stmt.length= view_query.length(); - - view->source.str= (char*) thd->lex->create_view_select_start; - view->source.length= (thd->lex->create_view_select_end - - thd->lex->create_view_select_start); - trim_whitespace(thd->charset(), & view->source); + view->source= thd->lex->create_view_select; view->file_version= 1; view->calc_md5(md5); |