diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 01:02:01 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 01:02:01 +0300 |
| commit | d6a7de2022756fc1eebe11e4b9e30f33ff541a25 (patch) | |
| tree | 858b1151f3c171c0858661df0b7ebd790efb2eab /sql/sql_derived.cc | |
| parent | a8700998174de23cb0deeb75aba29f6afb17dedc (diff) | |
| parent | e7bb818116d6fad5376452a7d0b326e8787f6a0e (diff) | |
| download | mariadb-git-d6a7de2022756fc1eebe11e4b9e30f33ff541a25.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 2ca97a32071..4578bcec394 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -520,6 +520,8 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived) derived->merge_underlying_list != 0)); if (derived->merged_for_insert) DBUG_RETURN(FALSE); + if (derived->init_derived(thd, FALSE)) + DBUG_RETURN(TRUE); if (derived->is_materialized_derived()) DBUG_RETURN(mysql_derived_prepare(thd, lex, derived)); if ((thd->lex->sql_command == SQLCOM_UPDATE_MULTI || @@ -537,8 +539,6 @@ bool mysql_derived_merge_for_insert(THD *thd, LEX *lex, TABLE_LIST *derived) DBUG_ASSERT(derived->table); } } - else - derived->table= derived->merge_underlying_list->table; DBUG_RETURN(FALSE); } |