diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-02-15 18:08:08 +0100 |
| commit | 99d7b312a148a01934d9cb2cc208eaabca816ae8 (patch) | |
| tree | f04a1c26fabcc5463aca51a860f03131e02d94f7 /sql/sql_load.cc | |
| parent | cb6bdec4d6f7b66ff6b0be7fe4b3398da9fc780d (diff) | |
| parent | 5f2a537ad4a1a8acc2e77411391a24bc3288ef50 (diff) | |
| download | mariadb-git-99d7b312a148a01934d9cb2cc208eaabca816ae8.tar.gz | |
5.3.4 merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index aab9ea76499..33d1741b5ec 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -235,7 +235,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"); |