diff options
| author | Daniel Black <daniel.black@au.ibm.com> | 2016-09-23 09:24:22 +1000 |
|---|---|---|
| committer | Daniel Black <daniel.black@au.ibm.com> | 2016-09-23 09:24:22 +1000 |
| commit | f05dfbebccf415ab5f9f9ee4253478636baf9b34 (patch) | |
| tree | 5f0d2da20d2044cc3beb3454ecf53ccdeecc723f /sql/sql_window.cc | |
| parent | 633e995c6299afdd2d20ea7b7a46a5359e6eb552 (diff) | |
| parent | 6304c0bfc7242ad54d93168e97e82022765934e3 (diff) | |
| download | mariadb-git-f05dfbebccf415ab5f9f9ee4253478636baf9b34.tar.gz | |
Merge 10.2
Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
Diffstat (limited to 'sql/sql_window.cc')
| -rw-r--r-- | sql/sql_window.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_window.cc b/sql/sql_window.cc index e720c39eb8f..4705fdce896 100644 --- a/sql/sql_window.cc +++ b/sql/sql_window.cc @@ -238,7 +238,7 @@ setup_windows(THD *thd, Ref_ptr_array ref_pointer_array, TABLE_LIST *tables, static int compare_order_elements(ORDER *ord1, ORDER *ord2) { - if (*ord1->item == *ord2->item) + if (*ord1->item == *ord2->item && ord1->direction == ord2->direction) return CMP_EQ; Item *item1= (*ord1->item)->real_item(); Item *item2= (*ord2->item)->real_item(); |