diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-04-02 15:04:45 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-04-16 09:25:43 +0200 |
commit | eb056f8726131b652f22b33b23c0682741ea5475 (patch) | |
tree | fa1ba13b71955dfa2d62b026980af882b48e6177 /sql/sql_derived.cc | |
parent | 6c306a729d79504d6dd8efc42db78011cb6956d5 (diff) | |
download | mariadb-git-eb056f8726131b652f22b33b23c0682741ea5475.tar.gz |
MDEV-17362: SIGSEGV in JOIN::optimize_inner or Assertion `fixed == 0' failed in Item_equal::fix_fields, server crashes after 2nd execution of PS
Move reinitialisation of pushdown variables for every query, because it used now not only for derived tables.
Diffstat (limited to 'sql/sql_derived.cc')
-rw-r--r-- | sql/sql_derived.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 548383e818c..c2412657371 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1293,11 +1293,6 @@ bool mysql_derived_reinit(THD *thd, LEX *lex, TABLE_LIST *derived) unit->types.empty(); /* for derived tables & PS (which can't be reset by Item_subselect) */ unit->reinit_exec_mechanism(); - for (st_select_lex *sl= unit->first_select(); sl; sl= sl->next_select()) - { - sl->cond_pushed_into_where= NULL; - sl->cond_pushed_into_having= NULL; - } unit->set_thd(thd); DBUG_RETURN(FALSE); } |