1 files changed, 15 insertions, 2 deletions
diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index 40f0c5ede5f..d512a9727b6 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -310,6 +310,8 @@ public:
     sort_length+= len;
   }
 
+  int compare_keys(uchar *a, uchar *b);
+
   static const uint size_of_length_field= 4;
 
 private:
@@ -567,8 +569,8 @@ public:
 
   bool using_packed_sortkeys() const
   {
-    DBUG_ASSERT(m_using_packed_sortkeys ==
-                (sort_keys != NULL && sort_keys->using_packed_sortkeys()));
+    DBUG_ASSERT(sort_keys == NULL ||
+                (m_using_packed_sortkeys == sort_keys->using_packed_sortkeys()));
     return m_using_packed_sortkeys;
   }
 
@@ -578,6 +580,11 @@ public:
     return addon_fields != NULL;
   }
 
+  void set_using_packed_keys(bool val)
+  {
+    m_using_packed_sortkeys= val;
+  }
+
   uint32 get_result_length(uchar *plen)
   {
     if (!m_using_packed_addons)
@@ -659,6 +666,12 @@ public:
   {
     return m_packed_format;
   }
+  void set_packed_format(bool val)
+  {
+    m_packed_format= val;
+  }
+
+  uint32 get_record_length_for_unique(uchar *to, uint size_of_dupl_count);
 
 private:
   uint m_packable_length;