1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)

Browse Source 
backport the new fix from 10.0
This commit is contained in:
Sergei Golubchik 2014-10-03 23:04:25 +02:00
parent 604b653394
commit c0977073e1
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sql/item_sum.cc
View File

@ -3295,18 +3295,6 @@ void Item_func_group_concat::cleanup()
DBUG_ASSERT(tree == 0); DBUG_ASSERT(tree == 0);
} }
/*
For prepared statements we have to restore pointers for ORDER BY as
they may point to areas that are freed at cleanup().
*/
if (!current_thd->stmt_arena->is_conventional() && arg_count_order)
{
memcpy(args + arg_count_field, orig_args + arg_count_field,
sizeof(Item*) * arg_count_order);
for (uint i= 0 ; i < arg_count_order ; i++)
order[i]->item = args + arg_count_field + i;
}
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

2
sql/sql_select.cc
View File

@ -20425,7 +20425,7 @@ find_order_in_list(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
order_item->full_name(), thd->where); order_item->full_name(), thd->where);
return TRUE; 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->in_field_list= 1;
order->counter= count; order->counter= count;
order->counter_used= 1; order->counter_used= 1;