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_prepare.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_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 611c8ddf944..32ce8dc6fc4 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -1274,7 +1274,7 @@ static int mysql_test_update(Prepared_statement *stmt, if (table_list->handle_derived(thd->lex, DT_PREPARE)) goto error; - if (!table_list->updatable) + if (!table_list->single_table_updatable()) { my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "UPDATE"); goto error; @@ -1348,7 +1348,7 @@ static bool mysql_test_delete(Prepared_statement *stmt, if (mysql_handle_derived(thd->lex, DT_PREPARE)) goto error; - if (!table_list->updatable) + if (!table_list->single_table_updatable()) { my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "DELETE"); goto error; |