mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
BUG#29610: crash in func_group on 64bit platform:
- make merge_buffers():sort_length have type size_t as this type is expected by, e.g. ptr_compare_1, which will receive pointer to sort_length as comparison parameter. sql/filesort.cc: BUG#29610: crash in func_group on 64bit platform: - make sort_length have type size_t as this type is expected by, e.g. ptr_compare_1, which will receive pointer to sort_length as comparison parameter.
This commit is contained in:
parent
33e556ff55
commit
70dc244841
1 changed files with 2 additions and 1 deletions
|
@ -1120,7 +1120,8 @@ int merge_buffers(SORTPARAM *param, IO_CACHE *from_file,
|
|||
int flag)
|
||||
{
|
||||
int error;
|
||||
uint rec_length,sort_length,res_length,offset;
|
||||
uint rec_length,res_length,offset;
|
||||
size_t sort_length;
|
||||
ulong maxcount;
|
||||
ha_rows max_rows,org_max_rows;
|
||||
my_off_t to_start_filepos;
|
||||
|
|
Loading…
Add table
Reference in a new issue