database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-12-20 13:30:05 +02:00
parent 7bbc6c14d1 042f763268
commit e3d89652e5
44 changed files with 1514 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/filesort_utils.cc
View File

@ -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));