diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-07-25 00:41:54 +0300 |
| commit | 786ad0a158f92eae0d65b02f34e864a7bbd8390e (patch) | |
| tree | 8b796ce3ce81ab3c1f73e6eb5c594c74619810c0 /sql/sql_derived.cc | |
| parent | 2ce3f95151a424f950be40140c45b0ba583e07ab (diff) | |
| parent | c8a0244e957bc4beff453f09c881bb51752d682c (diff) | |
| download | mariadb-git-786ad0a158f92eae0d65b02f34e864a7bbd8390e.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into 10.0
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 af5b016df9d..2ca97a32071 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -537,6 +537,8 @@ 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); } |