summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2013-04-02 16:05:10 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2013-04-02 16:05:10 +0200
commitb432e3da110bff8755c951894f4b95864f9ae4ba (patch)
tree9370da592608c4eb79302a66f2ecd2d14f7e356a /sql
parent68624a3160c77a476bea97e3c09b2e5f7f6d0080 (diff)
downloadmariadb-git-b432e3da110bff8755c951894f4b95864f9ae4ba.tar.gz
Bug#14700180 CRASH IN COPY_FUNCS
This is a backport of the fix for Bug#13966809 CRASH IN COPY_FUNCS WHEN GROUPING BY OUTER QUERY BLOB FIELD IN SUBQUERY
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_select.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 6634fb75e24..95092d6548e 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -9717,7 +9717,7 @@ static Field *create_tmp_field_from_item(THD *thd, Item *item, TABLE *table,
if (new_field)
new_field->init(table);
- if (copy_func && item->is_result_field())
+ if (copy_func && item->real_item()->is_result_field())
*((*copy_func)++) = item; // Save for copy_funcs
if (modify_item)
item->set_result_field(new_field);