diff options
| author | Igor Babaev <igor@askmonty.org> | 2016-09-09 13:25:02 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2016-09-09 13:25:02 -0700 |
| commit | 5c7d82934690991ae98331c0ad14fce6e2f9760d (patch) | |
| tree | 7b4c8ab2be0279d9dcfdbd3102264a1e91df470e /sql/sql_derived.cc | |
| parent | effb65bc863da0f1115e16ef5f11d11a13cdc7a0 (diff) | |
| download | mariadb-git-5c7d82934690991ae98331c0ad14fce6e2f9760d.tar.gz | |
Another attempt to fix bug mdev-10736.
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index a5e73acdc47..b0d505b8b38 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -480,10 +480,6 @@ unconditional_materialization: derived->set_materialized_derived(); if (!derived->table || !derived->table->is_created()) res= mysql_derived_create(thd, lex, derived); -#if 0 - if (!res) - res= mysql_derived_fill(thd, lex, derived); -#endif goto exit_merge; } @@ -920,7 +916,7 @@ bool mysql_derived_create(THD *thd, LEX *lex, TABLE_LIST *derived) if (table->is_created()) DBUG_RETURN(FALSE); - select_union *result= (select_union*)unit->result; + select_union *result= derived->derived_result; if (table->s->db_type() == TMP_ENGINE_HTON) { result->tmp_table_param.keyinfo= table->s->key_info; |