diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 14:51:21 +0400 |
| commit | b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e (patch) | |
| tree | 0a5326c23c1d2ab3752bcf621639494ca7c16fc1 /sql/sql_view.cc | |
| parent | 5bace3f049de457ddbeb3a1946089c0f4c479229 (diff) | |
| parent | 779e2a968632a5e73c660307892ca6a868399dfc (diff) | |
| download | mariadb-git-b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e.tar.gz | |
Manual merge from the bugfix tree.
conflicts:
conflict sql/sql_parse.cc
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 3d0d80c8ad1..133574089aa 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1190,9 +1190,10 @@ 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; - Parser_state parser_state(thd, - table->select_stmt.str, - table->select_stmt.length); + Parser_state parser_state; + if (parser_state.init(thd, table->select_stmt.str, + table->select_stmt.length)) + goto err; /* Use view db name as thread default database, in order to ensure |