1
0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00

Bug#35577, manual merge mysql-5.0-bugteam -> mysql-5.1-bugteam

This commit is contained in:
Marc Alff
2008-07-14 19:43:12 -06:00
16 changed files with 863 additions and 117 deletions

View File

@@ -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. */