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

Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.

Browse Source
This commit is contained in:
unknown
2012-02-03 13:01:05 +02:00
parent 046988661d
commit 79a04a2c9c
12 changed files with 183 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_update.cc
View File

@ -257,7 +257,7 @@ int mysql_update(THD *thd,
thd_proc_info(thd, "init");
table= table_list->table;
if (!table_list->updatable)
if (!table_list->single_table_updatable())
{
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "UPDATE");
DBUG_RETURN(1);
@ -1090,7 +1090,7 @@ reopen_tables:
/* if table will be updated then check that it is unique */
if (table->map & tables_for_update)
{
if (!tl->updatable || check_key_in_view(thd, tl))
if (!tl->single_table_updatable() || check_key_in_view(thd, tl))
{
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), tl->alias, "UPDATE");
DBUG_RETURN(TRUE);