diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-07-21 20:11:07 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-07-21 20:11:07 +0200 |
| commit | 6190a02f3593f82e2d4916ed660afb5e5d631a5a (patch) | |
| tree | f6fc56fd7aad1a332f9fc6850b2d579198d09ff8 /sql/sql_window.cc | |
| parent | cf6d83e7d68bd2bc0af0404bf4dd15218847074d (diff) | |
| parent | 4c387945f0f8d5df84ae987c4a4bba7675815c72 (diff) | |
| download | mariadb-git-6190a02f3593f82e2d4916ed660afb5e5d631a5a.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_window.cc')
| -rw-r--r-- | sql/sql_window.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/sql_window.cc b/sql/sql_window.cc index abb3937096f..876ddef8f65 100644 --- a/sql/sql_window.cc +++ b/sql/sql_window.cc @@ -592,9 +592,15 @@ int compare_window_funcs_by_window_specs(Item_window_func *win_func1, Let's use only one of the lists. */ if (!win_spec1->name() && win_spec2->name()) + { + win_spec1->save_partition_list= win_spec1->partition_list; win_spec1->partition_list= win_spec2->partition_list; + } else + { + win_spec2->save_partition_list= win_spec2->partition_list; win_spec2->partition_list= win_spec1->partition_list; + } cmp= compare_order_lists(win_spec1->order_list, win_spec2->order_list); @@ -607,9 +613,15 @@ int compare_window_funcs_by_window_specs(Item_window_func *win_func1, Let's use only one of the lists. */ if (!win_spec1->name() && win_spec2->name()) + { + win_spec1->save_order_list= win_spec2->order_list; win_spec1->order_list= win_spec2->order_list; + } else + { + win_spec1->save_order_list= win_spec2->order_list; win_spec2->order_list= win_spec1->order_list; + } cmp= compare_window_frames(win_spec1->window_frame, win_spec2->window_frame); |