diff options
| author | Varun Gupta <varun.gupta@mariadb.com> | 2020-03-10 23:19:12 +0530 |
|---|---|---|
| committer | Varun Gupta <varun.gupta@mariadb.com> | 2020-03-10 23:19:12 +0530 |
| commit | f3e4674a27a1319053a59f3d19a5ac7c43765a58 (patch) | |
| tree | a7cee0c3375d2b726e63299e83ff316f86bf0b1e /sql | |
| parent | 589a21c6311f6624540032442b91347fe8b06875 (diff) | |
| download | mariadb-git-f3e4674a27a1319053a59f3d19a5ac7c43765a58.tar.gz | |
Fix a compilation bug for 64 bit windows
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/filesort.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 73b50a30a2a..ea13e26c698 100644 --- 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; |