diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-09-24 15:41:42 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-09-24 15:41:42 +0200 |
| commit | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (patch) | |
| tree | 4a41dda7c0356114a674dcd0cc91526568056285 /sql | |
| parent | 3416facb3461b2994713e0dd0146579093a27282 (diff) | |
| download | mariadb-git-f1afc003eefe0aafd3e070c7453d9e029d8445a8.tar.gz | |
MDEV-6743 crash in GROUP_CONCAT(IF () ORDER BY 1)mariadb-10.0.14
new fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |