From 8c34eab9688b4face54f15f89f5d62bdfd93b8a7 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Thu, 28 Apr 2022 17:40:49 +0200
Subject: [PATCH] MDEV-28094 Window function in expression in ORDER BY

call item->split_sum_func() in setup_order() just as
it's done in setup_fields()
---
 mysql-test/main/win_sum.result | 12 ++++++++++++
 mysql-test/main/win_sum.test   | 13 +++++++++++++
 sql/sql_select.cc              |  4 ++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/mysql-test/main/win_sum.result b/mysql-test/main/win_sum.result
index 66a48fe8293..71d87bd6eca 100644
--- a/mysql-test/main/win_sum.result
+++ b/mysql-test/main/win_sum.result
@@ -93,3 +93,15 @@ pk	a	c	sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDING AND 1 FO
 126	6	NULL	NULL
 127	6	NULL	NULL
 drop table t1;
+#
+# End of 10.2 tests
+#
+#
+# MDEV-28094 Window function in expression in ORDER BY
+#
+SELECT EXISTS (SELECT 1 ORDER BY 1+sum(2) OVER ());
+EXISTS (SELECT 1 ORDER BY 1+sum(2) OVER ())
+1
+#
+# End of 10.4 tests
+#
diff --git a/mysql-test/main/win_sum.test b/mysql-test/main/win_sum.test
index aa4965bfd5a..640576acc53 100644
--- a/mysql-test/main/win_sum.test
+++ b/mysql-test/main/win_sum.test
@@ -45,3 +45,16 @@ select pk, a, c, sum(c) over (partition by a order by pk ROWS BETWEEN 1 PRECEDIN
 from t1;
 
 drop table t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
+--echo #
+--echo # MDEV-28094 Window function in expression in ORDER BY
+--echo #
+SELECT EXISTS (SELECT 1 ORDER BY 1+sum(2) OVER ());
+
+--echo #
+--echo # End of 10.4 tests
+--echo #
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 2b0977aca9f..735e00dd091 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -24546,8 +24546,8 @@ int setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables,
       return 1;
     }
 
-    if (from_window_spec && item->with_sum_func() &&
-        item->type() != Item::SUM_FUNC_ITEM)
+    if ((from_window_spec && item->with_sum_func() &&
+         item->type() != Item::SUM_FUNC_ITEM) || item->with_window_func)
     {
       item->split_sum_func(thd, ref_pointer_array,
                            all_fields, SPLIT_SUM_SELECT);