From ae01a3533b67811b335ce0dc877db3ea4568dd26 Mon Sep 17 00:00:00 2001
From: unknown <serg@serg.mysql.com>
Date: Thu, 13 Mar 2003 18:46:40 +0100
Subject: [PATCH] fix for crash with small sort_buffer

---
 sql/filesort.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sql/filesort.cc b/sql/filesort.cc
index ee87d508dd3..6ea97eb219a 100644
--- 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);