diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 09:50:56 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-08 10:19:55 +0200 |
| commit | c761b43451d54eeeecdf3c102906fcce88d4e9d9 (patch) | |
| tree | c00b07bf4b36108f1ecbfc3015b5594899e0e248 /sql/sql_partition.cc | |
| parent | 07e4853c232726a639b30d4718bef9914ea42d24 (diff) | |
| parent | bac2ec3a5b28ed590826b20a4cf27fd788903bbd (diff) | |
| download | mariadb-git-c761b43451d54eeeecdf3c102906fcce88d4e9d9.tar.gz | |
Merge 10.3 into 10.4mariadb-10.4.0
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 95d14d9ab0d..96e07b19dd8 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -853,7 +853,7 @@ static bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, const bool save_agg_field= thd->lex->current_select->non_agg_field_used(); const bool save_agg_func= thd->lex->current_select->agg_func_used(); const nesting_map saved_allow_sum_func= thd->lex->allow_sum_func; - thd->lex->allow_sum_func= 0; + thd->lex->allow_sum_func.clear_all(); if (likely(!(error= func_expr->fix_fields_if_needed(thd, (Item**)&func_expr)))) func_expr->walk(&Item::post_fix_fields_part_expr_processor, 0, NULL); |