Corrected the function compare_order_elements() to make it

platform independent.
MariaDB · Aug 20, 2017 · a1e444e · a1e444e
1 parent d7b45e0
commit a1e444e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/mysql-test/r/derived_cond_pushdown.result b/mysql-test/r/derived_cond_pushdown.result
@@ -9458,10 +9458,10 @@ EXPLAIN
           "window_functions_computation": {
             "sorts": {
               "filesort": {
-                "sort_key": "t2.c"
+                "sort_key": "t2.a, t2.c"
               },
               "filesort": {
-                "sort_key": "t2.a, t2.c"
+                "sort_key": "t2.c"
               }
             },
             "temporary_table": {

diff --git a/sql/sql_window.cc b/sql/sql_window.cc
@@ -405,7 +405,8 @@ int compare_order_elements(ORDER *ord1, ORDER *ord2)
   Item *item2= (*ord2->item)->real_item();
   DBUG_ASSERT(item1->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 (ord1->direction == ord2->direction)