diff options
| author | unknown <sanja@askmonty.org> | 2013-06-06 23:33:40 +0300 |
|---|---|---|
| committer | unknown <sanja@askmonty.org> | 2013-06-06 23:33:40 +0300 |
| commit | ad947563ac9e42090cbcaef00ce0d22708d19f12 (patch) | |
| tree | 0c8e2f385eda315630ab6d0e31563104883907f7 /sql/sql_derived.cc | |
| parent | fce7fc43ba165cd704889c9d35f92e15288f5730 (diff) | |
| download | mariadb-git-ad947563ac9e42090cbcaef00ce0d22708d19f12.tar.gz | |
MDEV-4593: p_s: crash in simplify_joins with delete using subselect from view
mysql_derived_merge_for_insert() should not be called for views or derived tables which are not put (directly or via other views) in main SELECT_LEX "join list".
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 99d20090623..afc2dea359a 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -83,7 +83,16 @@ mysql_handle_derived(LEX *lex, uint phases) sl && !res; sl= sl->next_select_in_list()) { - for (TABLE_LIST *cursor= sl->get_table_list(); + TABLE_LIST *cursor= sl->get_table_list(); + /* + DT_MERGE_FOR_INSERT is not needed for views/derived tables inside + subqueries. Views and derived tables of subqueries should be + processed normally. + */ + if (phases == DT_MERGE_FOR_INSERT && + cursor && cursor->top_table()->select_lex != &lex->select_lex) + continue; + for (; cursor && !res; cursor= cursor->next_local) { |