database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

merge

Browse Source 
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
This commit is contained in:
unknown
2004-10-07 11:36:46 +03:00
parent 61e96be77f 640fefffa7
commit 5b82bc6644
13 changed files with 150 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_update.cc
View File

@ -72,7 +72,7 @@ static bool check_fields(THD *thd, List<Item> &items)
{
if (!(field= item->filed_for_view_update()))
{
/* as far as item comes from VIEW select list it has name */
/* item has name, because it comes from VIEW SELECT list */
my_error(ER_NONUPDATEABLE_COLUMN, MYF(0), item->name);
return TRUE;
}
@ -626,8 +626,9 @@ int mysql_multi_update_prepare(THD *thd)
}
/*
setup_tables() need for VIEWs. JOIN::prepare() will not do it second
time.
setup_tables() need for VIEWs. JOIN::prepare() will call setup_tables()
second time, but this call will do nothing (there are check for second
call in setup_tables()).
*/
if ((thd->lex->select_lex.no_wrap_view_item= 1,
res= setup_fields(thd, 0, table_list, *fields, 1, 0, 0),