Hi Varun, * The patch needs a testcase * Please check the comment at https://jira.mariadb.org/browse/MDEV-21922 , and add a comment in filesort_use_addons() about the use of upper bound for computations. * Ok to push after the above is addressed. On Thu, Mar 12, 2020 at 05:11:45PM +0530, Varun wrote:

revision-id: 70b0c838fada8e02d4ce9525611d6f4aeadf56d4 (mariadb-10.5.0-367-g70b0c838fad) parent(s): 9d7ed94f6a526748eff29dae2939a3fd341f118b author: Varun Gupta committer: Varun Gupta timestamp: 2020-03-12 14:41:03 +0530 message:

MDEV-21922: Allow packing addon fields even if they don't honour max_length_for_sort_data

Addon fields will be packed if the length of addon fields is greater than max_length_for_sort_data.

--- sql/filesort.cc | 2 -- 1 file changed, 2 deletions(-)

diff --git a/sql/filesort.cc b/sql/filesort.cc index 1e19d492220..7b4e0bc31cd 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -139,8 +139,6 @@ void Sort_param::try_to_pack_addons(ulong max_length_for_sort_data) return;

const uint sz= Addon_fields::size_of_length_field; - if (rec_length + sz > max_length_for_sort_data) - return;

// Heuristic: skip packing if potential savings are less than 10 bytes. if (m_packable_length < (10 + sz)) _______________________________________________ commits mailing list commits@mariadb.org https://lists.askmonty.org/cgi-bin/mailman/listinfo/commits

BR Sergei -- Sergei Petrunia, Software Developer MariaDB Corporation | Skype: sergefp | Blog: http://s.petrunia.net/blog