summaryrefslogtreecommitdiff
path: root/sql/item_subselect.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-05-17 08:42:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-05-17 08:42:53 +0300
commit4c7608aeb187383f2629e96e085b5b50fc81337f (patch)
treefc8dce68b02a63ca204203034dae81a7162a4b9f /sql/item_subselect.cc
parentc2352c45fbd670f50b73415eeeb676aa67fb4a29 (diff)
parenta4e7800701d0764fe4cbb85b81d7c7cb54677334 (diff)
downloadmariadb-git-4c7608aeb187383f2629e96e085b5b50fc81337f.tar.gz
Merge 10.2 into 10.3
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r--sql/item_subselect.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
index 99be2024c2f..143894ad949 100644
--- a/sql/item_subselect.cc
+++ b/sql/item_subselect.cc
@@ -156,6 +156,7 @@ void Item_subselect::cleanup()
reset();
filesort_buffer.free_sort_buffer();
my_free(sortbuffer.str);
+ sortbuffer.str= 0;
value_assigned= 0;
expr_cache= 0;