fix for crash with small sort_buffer

ff86765a · serg@serg.mysql.com · 6c81552d · ff86765a
Commit ff86765a authored Mar 13, 2003 by serg@serg.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

sql/filesort.cc sql/filesort.cc +5 -0

No files found.
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -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);