MDEV-13694: Wrong result upon GROUP BY with orderby_uses_equalities=on

For the case when  the SJM scan table is the first table in the join order,
then if we want to do the sorting on the SJM scan table, then we need to
make sure that we unpack the values to base table fields in two cases:
    1) Reading the SJM table and writing the sort-keys inside the sort-buffer
    2) Reading the sorted data from the sort file

1 files changed, 3 insertions, 0 deletions

diff --git a/sql/sql_sort.h b/sql/sql_sort.h
index 40f0c5ede5f..3230052dd84 100644
--- a/sql/sql_sort.h
+++ b/sql/sql_sort.h
@@ -533,6 +533,7 @@ public:
   Addon_fields *addon_fields;     // Descriptors for companion fields.
   Sort_keys *sort_keys;
   bool using_pq;
+  bool set_all_read_bits;
 
   uchar *unique_buff;
   bool not_killable;
@@ -553,6 +554,8 @@ public:
   }
   void init_for_filesort(uint sortlen, TABLE *table,
                          ha_rows maxrows, bool sort_positions);
+
+   void  (*unpack)(TABLE *);
   /// Enables the packing of addons if possible.
   void try_to_pack_addons(ulong max_length_for_sort_data);