mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
fix for crash with small sort_buffer
This commit is contained in:
parent
6c81552dd3
commit
ff86765a4d
1 changed files with 5 additions and 0 deletions
|
@ -198,6 +198,11 @@ ha_rows filesort(TABLE **table, SORT_FIELD *sortorder, uint s_length,
|
|||
param.keys--;
|
||||
maxbuffer+=10; /* Some extra range */
|
||||
|
||||
if (memavl < param.sort_length*MERGEBUFF2)
|
||||
{
|
||||
my_error(ER_OUT_OF_SORTMEMORY,MYF(0));
|
||||
goto err;
|
||||
}
|
||||
if (memavl < MIN_SORT_MEMORY)
|
||||
{
|
||||
my_error(ER_OUTOFMEMORY,MYF(ME_ERROR+ME_WAITTANG),sortbuff_size);
|
||||
|
|
Loading…
Reference in a new issue