Fix a compilation bug for 64 bit windows

f3e4674a · Varun Gupta · 589a21c6 · f3e4674a
Commit f3e4674a authored Mar 10, 2020 by Varun Gupta
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

sql/filesort.cc sql/filesort.cc +3 -2

No files found.
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -2937,8 +2937,9 @@ SORT_FIELD_ATTR::pack_sort_string(uchar *to, const LEX_CSTRING &str,
                                  CHARSET_INFO *cs) const
 {
  uchar *orig_to= to;
-  size_t length, data_length;
-  length= str.length;
+  uint32 length, data_length;
+  DBUG_ASSERT(str.length <= UINT32_MAX);
+  length= (uint32)str.length;

  if (length + suffix_length <= original_length)
    data_length= length;