From 8481c70ede067b576d5b1576a9b68042e84368fb Mon Sep 17 00:00:00 2001
From: Igor Babaev <igor@askmonty.org>
Date: Wed, 1 Feb 2017 19:15:28 -0800
Subject: Fixed bug mdev-11867.

If a window function with aggregation is over the result
set of a grouping query then the argument of the aggregate
function from the window function is allowed to be an
aggregate function itself.
---
 sql/sql_yacc.yy | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'sql/sql_yacc.yy')

diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy
index 0cd2c563319..12423e71f1f 100644
--- a/sql/sql_yacc.yy
+++ b/sql/sql_yacc.yy
@@ -10464,6 +10464,9 @@ window_func:
           simple_window_func
         |
           sum_expr
+          {
+            ((Item_sum *) $1)->mark_as_window_func_sum_expr();
+          }
         ;
 
 simple_window_func:
-- 
cgit v1.2.1