diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2021-06-30 18:13:08 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2021-06-30 18:41:46 +0300 |
| commit | eebe2090c848b5cedc5235473d80dbd2c25d2943 (patch) | |
| tree | bd12d7d9809997b892437ef3b7341d330ee46147 /sql/sql_lex.cc | |
| parent | a1e2ca057dda4dc434f057ce9391aa7afd9b5583 (diff) | |
| parent | 4a6e2d343745c11086c05f0041a8267591bb073c (diff) | |
| download | mariadb-git-eebe2090c848b5cedc5235473d80dbd2c25d2943.tar.gz | |
Merge 10.3 -> 10.4
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 93a4fcbe277..1ec5d0b0550 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -31,6 +31,7 @@ #include "sql_select.h" #include "sql_cte.h" #include "sql_signal.h" +#include "sql_derived.h" #include "sql_truncate.h" // Sql_cmd_truncate_table #include "sql_admin.h" // Sql_cmd_analyze/Check..._table #include "sql_partition.h" @@ -9744,8 +9745,7 @@ void st_select_lex::pushdown_cond_into_where_clause(THD *thd, Item *cond, if (!join->group_list && !with_sum_func) { - cond= - cond->transform(thd, transformer, arg); + cond= transform_condition_or_part(thd, cond, transformer, arg); if (cond) { cond->walk( @@ -9770,9 +9770,12 @@ void st_select_lex::pushdown_cond_into_where_clause(THD *thd, Item *cond, into WHERE so it can be pushed. */ if (cond_over_grouping_fields) - cond_over_grouping_fields= cond_over_grouping_fields->transform(thd, - &Item::grouping_field_transformer_for_where, - (uchar*) this); + { + cond_over_grouping_fields= + transform_condition_or_part(thd, cond_over_grouping_fields, + &Item::grouping_field_transformer_for_where, + (uchar*) this); + } if (cond_over_grouping_fields) { |