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

sql_view.cc:

Browse Source 
After merge fix


sql/sql_view.cc:
  After merge fix
This commit is contained in:
unknown 2006-08-09 06:46:06 +04:00
parent a5ccdea772
commit 4abe4b1717
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_view.cc
View File

@ -179,23 +179,16 @@ static bool
fill_defined_view_parts (THD *thd, TABLE_LIST *view) fill_defined_view_parts (THD *thd, TABLE_LIST *view)
{ {
LEX *lex= thd->lex; LEX *lex= thd->lex;
bool free_view= 1; bool not_used;
TABLE_LIST decoy; TABLE_LIST decoy;
if (view->view)
free_view= 0;
memcpy (&decoy, view, sizeof (TABLE_LIST)); memcpy (&decoy, view, sizeof (TABLE_LIST));
if (!open_table(thd, &decoy, thd->mem_root, &not_used, OPEN_VIEW_NO_PARSE) && if (!open_table(thd, &decoy, thd->mem_root, &not_used, OPEN_VIEW_NO_PARSE) &&
!decoy.view) !decoy.view)
{ {
/* It's a table */ /* It's a table */
my_free((gptr)decoy.table, MYF(0));
my_error(ER_WRONG_OBJECT, MYF(0), view->db, view->table_name, "VIEW");
return TRUE; return TRUE;
} }
if (!decoy.view)
/* An error while opening the view occurs, caller will handle it */
return FALSE;
if (!lex->definer) if (!lex->definer)
{ {
@ -208,11 +201,6 @@ fill_defined_view_parts (THD *thd, TABLE_LIST *view)
if (lex->create_view_suid == VIEW_SUID_DEFAULT) if (lex->create_view_suid == VIEW_SUID_DEFAULT)
lex->create_view_suid= decoy.view_suid ? lex->create_view_suid= decoy.view_suid ?
VIEW_SUID_DEFINER : VIEW_SUID_INVOKER; VIEW_SUID_DEFINER : VIEW_SUID_INVOKER;
if (free_view)
{
delete decoy.view;
lex->cleanup_after_one_table_open();
}
return FALSE; return FALSE;
} }