Merge 10.11 into 11.0

1 files changed, 4 insertions, 15 deletions

diff --git a/sql/filesort_utils.h b/sql/filesort_utils.h
index 73aa2f76a18..776e986e14a 100644
--- a/sql/filesort_utils.h
+++ b/sql/filesort_utils.h
@@ -305,22 +305,11 @@ public:
   /**
     We need an assignment operator, see filesort().
     This happens to have the same semantics as the one that would be
-    generated by the compiler. We still implement it here, to show shallow
-    assignment explicitly: we have two objects sharing the same array.
+    generated by the compiler.
+    Note that this is a shallow copy. We have two objects sharing the same
+    array.
   */
-  Filesort_buffer &operator=(const Filesort_buffer &rhs)
-  {
-    m_next_rec_ptr= rhs.m_next_rec_ptr;
-    m_rawmem= rhs.m_rawmem;
-    m_record_pointers= rhs.m_record_pointers;
-    m_sort_keys= rhs.m_sort_keys;
-    m_num_records= rhs.m_num_records;
-    m_record_length= rhs.m_record_length;
-    m_sort_length= rhs.m_sort_length;
-    m_size_in_bytes= rhs.m_size_in_bytes;
-    m_idx= rhs.m_idx;
-    return *this;
-  }
+  Filesort_buffer &operator=(const Filesort_buffer &rhs) = default;
 
   uint get_sort_length() const { return m_sort_length; }
   void set_sort_length(uint val) { m_sort_length= val; }