diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-12-20 12:51:57 +0200 |
| commit | 042f763268c0f209e7c12e0a6a72bb5d204dfe29 (patch) | |
| tree | 7ee15ab50af97cab4135f3712f95ac12fafc74c5 /sql/filesort_utils.cc | |
| parent | cb121a047b55403fe271570c928fd95ed64a1c8f (diff) | |
| parent | 924db8b4ed3f268cbe91a1734611f4dc2311c7be (diff) | |
| download | mariadb-git-042f763268c0f209e7c12e0a6a72bb5d204dfe29.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'sql/filesort_utils.cc')
| -rw-r--r-- | sql/filesort_utils.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort_utils.cc b/sql/filesort_utils.cc index 1cef30b6a56..bc0fe4712b6 100644 --- a/sql/filesort_utils.cc +++ b/sql/filesort_utils.cc @@ -96,7 +96,7 @@ uchar **Filesort_buffer::alloc_sort_buffer(uint num_records, uint record_length) if (m_idx_array.is_null()) { - sort_buff_sz= num_records * (record_length + sizeof(uchar*)); + sort_buff_sz= ((size_t)num_records) * (record_length + sizeof(uchar*)); set_if_bigger(sort_buff_sz, record_length * MERGEBUFF2); uchar **sort_keys= (uchar**) my_malloc(sort_buff_sz, MYF(MY_THREAD_SPECIFIC)); |