database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

don't set derived->merged until derived is really irreversibly merged

Browse Source 
it was set before big if() that could decide not to merge and
go with materialization.

this fixes a crash in main.view test
This commit is contained in:
Sergei Golubchik
2018-02-05 16:00:13 +01:00
parent 4771ae4b22
commit c4930a820a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_derived.cc
View File

@ -388,7 +388,6 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
thd->save_prep_leaf_list= TRUE; thd->save_prep_leaf_list= TRUE;
arena= thd->activate_stmt_arena_if_needed(&backup); // For easier test arena= thd->activate_stmt_arena_if_needed(&backup); // For easier test
derived->merged= TRUE;
if (!derived->merged_for_insert || if (!derived->merged_for_insert ||
(derived->is_multitable() && (derived->is_multitable() &&
@ -452,6 +451,7 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
if (parent_lex->join) if (parent_lex->join)
parent_lex->join->table_count+= dt_select->join->table_count - 1; parent_lex->join->table_count+= dt_select->join->table_count - 1;
} }
derived->merged= TRUE;
if (derived->get_unit()->prepared) if (derived->get_unit()->prepared)
{ {
Item *expr= derived->on_expr; Item *expr= derived->on_expr;