diff options
| author | unknown <sanja@montyprogram.com> | 2012-02-03 13:01:05 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2012-02-03 13:01:05 +0200 |
| commit | 79a04a2c9c2cb04bc635b609504e2b9fb57fd23d (patch) | |
| tree | 92688c82ffbce89404da4ce64992172932b42092 /sql/sql_update.cc | |
| parent | 046988661d330e48e19af9fd7d9d2ad4f6cbcd1e (diff) | |
| download | mariadb-git-79a04a2c9c2cb04bc635b609504e2b9fb57fd23d.tar.gz | |
Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 80eb823c346..a921a87884e 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -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); |