From f1afc003eefe0aafd3e070c7453d9e029d8445a8 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <sergii@pisem.net>
Date: Wed, 24 Sep 2014 15:41:42 +0200
Subject: MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)

new fix
---
 sql/sql_select.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 79f38e2884a..eff1c382945 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -21143,7 +21143,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
                order_item->full_name(), thd->where);
       return TRUE;
     }
-    order->item= ref_pointer_array + count - 1;
+    thd->change_item_tree((Item**)&order->item, (Item*)(ref_pointer_array + count - 1));
     order->in_field_list= 1;
     order->counter= count;
     order->counter_used= 1;
-- 
cgit v1.2.1