diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:06:50 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:06:50 +0300 |
| commit | ec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (patch) | |
| tree | 751af6227789bfa916a6de426542a966845c8cd1 /sql/sql_derived.cc | |
| parent | ba0ee91077d9b89296328892aa5d5d293f4e0fb1 (diff) | |
| parent | b337a0682943fa7e055380b7859762acf7fb588c (diff) | |
| download | mariadb-git-ec6042bda097fa53c43caf4a1acc32c5a77f6ed4.tar.gz | |
Merge branch '10.0' into 10.1
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 d8386666de4..5d12091c4b4 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); } |