diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-06-11 17:48:24 +0400 |
| commit | eae3b4fe762965789badce7b2d6aa51b7f0c317a (patch) | |
| tree | bad36a3866fc1f57ed09d6de5a590fa2e12bacfe /sql/sql_view.cc | |
| parent | 6d38a625c158cb56b33d14496f353652d61f0f2d (diff) | |
| parent | b497e2c6b2155bfdc4fc63b0f80eba9a5062a02e (diff) | |
| download | mariadb-git-eae3b4fe762965789badce7b2d6aa51b7f0c317a.tar.gz | |
Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.
conflicts:
conflict mysys/safemalloc.c
conflict sql/mysqld.cc
conflict sql/sp.cc
conflict sql/sql_lex.cc
conflict sql/sql_lex.h
conflict sql/sql_parse.cc
conflict sql/sql_prepare.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 3e47899d638..8cb4df36cd5 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -1216,9 +1216,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 |