Merge 10.2 into 10.3

1 files changed, 4 insertions, 8 deletions

diff --git a/sql/item_windowfunc.h b/sql/item_windowfunc.h
index 9ba60c3956d..144deb18d8c 100644
--- a/sql/item_windowfunc.h
+++ b/sql/item_windowfunc.h
@@ -44,11 +44,6 @@ public:
     first_check= true;
   }
 
-  void cleanup()
-  {
-    group_fields.empty();
-  }
-
   /*
     Check if the current row is in a different group than the previous row
     this function was called for.
@@ -86,6 +81,10 @@ public:
     }
     return 0;
   }
+  ~Group_bound_tracker()
+  {
+    group_fields.delete_elements();
+  }
 
 private:
   List<Cached_item> group_fields;
@@ -215,7 +214,6 @@ public:
   {
     if (peer_tracker)
     {
-      peer_tracker->cleanup();
       delete peer_tracker;
       peer_tracker= NULL;
     }
@@ -285,7 +283,6 @@ class Item_sum_dense_rank: public Item_sum_int
   {
     if (peer_tracker)
     {
-      peer_tracker->cleanup();
       delete peer_tracker;
       peer_tracker= NULL;
     }
@@ -547,7 +544,6 @@ class Item_sum_percent_rank: public Item_sum_window_with_row_count
   {
     if (peer_tracker)
     {
-      peer_tracker->cleanup();
       delete peer_tracker;
       peer_tracker= NULL;
     }