diff options
| author | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2008-07-14 19:43:12 -0600 |
| commit | f34c99b4d8b60e6ae5cddde206ef4da30811e5fe (patch) | |
| tree | 302ecb26a02762cc90a264a5d6a12c76a15939fd /sql/sql_view.cc | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 5f9f35e291eba2e6b8fbdc7e763c14c370c676ec (diff) | |
| download | mariadb-git-f34c99b4d8b60e6ae5cddde206ef4da30811e5fe.tar.gz | |
Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index a654721de37..12b2adf4f13 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1147,9 +1147,9 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, char old_db_buf[NAME_LEN+1]; LEX_STRING old_db= { old_db_buf, sizeof(old_db_buf) }; bool dbchanged; - Lex_input_stream lip(thd, - table->select_stmt.str, - table->select_stmt.length); + Parser_state parser_state(thd, + table->select_stmt.str, + table->select_stmt.length); /* Use view db name as thread default database, in order to ensure @@ -1193,7 +1193,7 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table, /* Parse the query. */ - parse_status= parse_sql(thd, &lip, table->view_creation_ctx); + parse_status= parse_sql(thd, & parser_state, table->view_creation_ctx); /* Restore environment. */ |