diff options
| author | Igor Babaev <igor@askmonty.org> | 2011-05-20 12:47:39 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2011-05-20 12:47:39 -0700 |
| commit | 89cf840cd9709c875bb6494398970624c85e4ab0 (patch) | |
| tree | b6926318d94f0bcd733468587a4bed4101c81612 /sql/sql_load.cc | |
| parent | be6d6e1b3eb0d243dfa9f1d0de108069df5774e4 (diff) | |
| parent | d015b8fa0ad2bfb853da174c1c959374a24a5063 (diff) | |
| download | mariadb-git-89cf840cd9709c875bb6494398970624c85e4ab0.tar.gz | |
Merge
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index cc1f046b5f0..089c148778e 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -172,12 +172,15 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (open_and_lock_tables(thd, table_list)) DBUG_RETURN(TRUE); + if (mysql_handle_single_derived(thd->lex, table_list, DT_MERGE_FOR_INSERT) || + mysql_handle_single_derived(thd->lex, table_list, DT_PREPARE)) + DBUG_RETURN(TRUE); if (setup_tables_and_check_access(thd, &thd->lex->select_lex.context, &thd->lex->select_lex.top_join_list, table_list, - &thd->lex->select_lex.leaf_tables, FALSE, + thd->lex->select_lex.leaf_tables, FALSE, INSERT_ACL | UPDATE_ACL, - INSERT_ACL | UPDATE_ACL)) + INSERT_ACL | UPDATE_ACL, FALSE)) DBUG_RETURN(-1); if (!table_list->table || // do not suport join view !table_list->updatable || // and derived tables |