database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge

Browse Source 
sql/filesort.cc:
  SCCS merged
This commit is contained in:
unknown
2003-03-13 18:51:50 +01:00
parent d2d9910133 ae01a3533b
commit ead5a5deab
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/filesort.cc
View File

@@ -149,6 +149,11 @@ ha_rows filesort(TABLE *table, SORT_FIELD *sortorder, uint s_length,
if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)
memavl=MIN_SORT_MEMORY;
}
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),