diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 10:43:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-02-25 10:43:38 +0200 |
| commit | 00b70bbb51b9f2a3646c1ceedc6a27eeb1bdd6ac (patch) | |
| tree | 69d6515f2f36a7774e4b8b06c2173dffa0ec6e6d /sql/sql_select.cc | |
| parent | 7ab3db142bffa733587f6788c13b7d057a1bc13e (diff) | |
| parent | a3da3c8a0b1113d941f837cce0615673b95fb9f2 (diff) | |
| download | mariadb-git-00b70bbb51b9f2a3646c1ceedc6a27eeb1bdd6ac.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 81620efb835..35715fe2812 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -23766,7 +23766,9 @@ int setup_order(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, an ORDER BY clause */ - if (for_union && (*order->item)->with_sum_func) + if (for_union && + ((*order->item)->with_sum_func || + (*order->item)->with_window_func)) { my_error(ER_AGGREGATE_ORDER_FOR_UNION, MYF(0), number); return 1; |