diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-02-02 08:21:42 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-02-02 08:21:42 +0400 |
| commit | d333e3ad9c877ce7540bd1cdaf78094fa0f273c4 (patch) | |
| tree | d8314d20839872e0b71854ab84c7d4ae25e5dc6c /sql/item_sum.cc | |
| parent | 02a4bbb4128fbea05b503ebec4346c214e8e6c93 (diff) | |
| parent | 8481c70ede067b576d5b1576a9b68042e84368fb (diff) | |
| download | mariadb-git-d333e3ad9c877ce7540bd1cdaf78094fa0f273c4.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 879115d9b3b..12a92a5b911 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -151,6 +151,8 @@ bool Item_sum::check_sum_func(THD *thd, Item **ref) curr_sel->name_visibility_map); bool invalid= FALSE; DBUG_ASSERT(curr_sel->name_visibility_map); // should be set already + if (window_func_sum_expr_flag) + return false; /* The value of max_arg_level is updated if an argument of the set function contains a column reference resolved against a subquery whose level is @@ -460,6 +462,7 @@ void Item_sum::mark_as_sum_func() const_item_cache= false; with_sum_func= 1; with_field= 0; + window_func_sum_expr_flag= false; } |