diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-08 11:45:28 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-06-08 11:45:28 +0300 |
| commit | 57022dfb25b931a329905364d7056ac61950d300 (patch) | |
| tree | 94a7131bfffa205d89a8563a5c749f843b920ecb /sql/sql_derived.cc | |
| parent | eb14e073ea121954fb5be6fac92fd84b7d57bb07 (diff) | |
| parent | befb0bed68b555852e01859a846bf7ac40f15dbb (diff) | |
| download | mariadb-git-57022dfb25b931a329905364d7056ac61950d300.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 8396fd89433..3b312225937 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1,6 +1,6 @@ /* Copyright (c) 2002, 2011, Oracle and/or its affiliates. - Copyright (c) 2010, 2015, MariaDB + Copyright (c) 2010, 2020, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1197,7 +1197,6 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) DBUG_ASSERT(derived->table && derived->table->is_created()); select_unit *derived_result= derived->derived_result; SELECT_LEX *save_current_select= lex->current_select; - bool derived_recursive_is_filled= false; if (derived->pushdown_derived) { @@ -1238,7 +1237,6 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) { /* In this case all iteration are performed */ res= derived->fill_recursive(thd); - derived_recursive_is_filled= true; } } else if (unit->is_unit_op()) @@ -1294,8 +1292,7 @@ bool mysql_derived_fill(THD *thd, LEX *lex, TABLE_LIST *derived) } } err: - if (res || (!lex->describe && !unit->uncacheable && - (!derived_is_recursive || derived_recursive_is_filled))) + if (res || (!derived_is_recursive && !lex->describe && !unit->uncacheable)) unit->cleanup(); lex->current_select= save_current_select; |