diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-26 00:34:43 +0200 |
| commit | bb8e99fdc367a470c6195a2ae4c33f273fe55a25 (patch) | |
| tree | 3b3bcacec8faab66bf6756f20dff1e45462fdc1c /sql/sql_derived.cc | |
| parent | add44e684cb9f1b46d1d5facdf6255360fa7b656 (diff) | |
| parent | c02d61bc11ee06b6043e6db9a15d00b9f40bce1f (diff) | |
| download | mariadb-git-bb8e99fdc367a470c6195a2ae4c33f273fe55a25.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 796a8fe13f8..0272837c705 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 || |