database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Corrected the function compare_order_elements() to make it

Browse Source 
platform independent.
This commit is contained in:
Igor Babaev
2017-08-19 20:59:24 -07:00
parent d7b45e01b4
commit a1e444e1cc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/r/derived_cond_pushdown.result
View File

@ -9458,10 +9458,10 @@ EXPLAIN
"window_functions_computation": { "window_functions_computation": {
"sorts": { "sorts": {
"filesort": { "filesort": {
"sort_key": "t2.c" "sort_key": "t2.a, t2.c"
}, },
"filesort": { "filesort": {
"sort_key": "t2.a, t2.c" "sort_key": "t2.c"
} }
}, },
"temporary_table": { "temporary_table": {

3
sql/sql_window.cc
View File

@ -405,7 +405,8 @@ int compare_order_elements(ORDER *ord1, ORDER *ord2)
Item *item2= (*ord2->item)->real_item(); Item *item2= (*ord2->item)->real_item();
DBUG_ASSERT(item1->type() == Item::FIELD_ITEM && DBUG_ASSERT(item1->type() == Item::FIELD_ITEM &&
item2->type() == Item::FIELD_ITEM); item2->type() == Item::FIELD_ITEM);
int cmp= ((Item_field *) item1)->field - ((Item_field *) item2)->field; int cmp= ((Item_field *) item1)->field->field_index -
((Item_field *) item2)->field->field_index;
if (cmp == 0) if (cmp == 0)
{ {
if (ord1->direction == ord2->direction) if (ord1->direction == ord2->direction)