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

Merge remote-tracking branch 'origin/10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-12-22 12:23:39 +02:00
parent a76a2522ec 461cf3e5a3
commit 985d2d393c
87 changed files with 1806 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/filesort_utils.cc
View File

@ -105,7 +105,7 @@ uchar **Filesort_buffer::alloc_sort_buffer(uint num_records,
DBUG_EXECUTE_IF("alloc_sort_buffer_fail",
DBUG_SET("+d,simulate_out_of_memory"););
buff_size= num_records * (record_length + sizeof(uchar*));
buff_size= ((size_t)num_records) * (record_length + sizeof(uchar*));
set_if_bigger(buff_size, record_length * MERGEBUFF2);
if (!m_idx_array.is_null())