summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <sanja@montyprogram.com>2012-02-03 13:01:05 +0200
committerunknown <sanja@montyprogram.com>2012-02-03 13:01:05 +0200
commit79a04a2c9c2cb04bc635b609504e2b9fb57fd23d (patch)
tree92688c82ffbce89404da4ce64992172932b42092 /sql/sql_load.cc
parent046988661d330e48e19af9fd7d9d2ad4f6cbcd1e (diff)
downloadmariadb-git-79a04a2c9c2cb04bc635b609504e2b9fb57fd23d.tar.gz
Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 42a8f001c6f..7fcb52a7b9c 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -187,7 +187,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
INSERT_ACL | UPDATE_ACL, FALSE))
DBUG_RETURN(-1);
if (!table_list->table || // do not suport join view
- !table_list->updatable || // and derived tables
+ !table_list->single_table_updatable() || // and derived tables
check_key_in_view(thd, table_list))
{
my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "LOAD");