1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from 5.1 to 5.5

Browse Source
This commit is contained in:
Praveenkumar Hulakund 2013-01-10 14:37:02 +05:30
commit d6aed37a2f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_view.cc
View File

@ -1143,9 +1143,10 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
TODO: when VIEWs will be stored in cache, table mem_root should TODO: when VIEWs will be stored in cache, table mem_root should
be used here be used here
*/ */
if (parser->parse((uchar*)table, thd->mem_root, view_parameters, if ((result= parser->parse((uchar*)table, thd->mem_root,
required_view_parameters, &file_parser_dummy_hook)) view_parameters, required_view_parameters,
goto err; &file_parser_dummy_hook)))
goto end;
/* /*
check old format view .frm check old format view .frm
@ -1208,6 +1209,11 @@ bool mysql_make_view(THD *thd, File_parser *parser, TABLE_LIST *table,
now Lex placed in statement memory now Lex placed in statement memory
*/ */
table->view= lex= thd->lex= (LEX*) new(thd->mem_root) st_lex_local; table->view= lex= thd->lex= (LEX*) new(thd->mem_root) st_lex_local;
if (!table->view)
{
result= true;
goto end;
}
{ {
char old_db_buf[NAME_LEN+1]; char old_db_buf[NAME_LEN+1];