Merge bk-internal:/home/bk/mysql-4.0/

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
5a667a50 · unknown · aca9fe2d · ead5a5de · 5a667a50
Commit 5a667a50 authored Mar 13, 2003 by unknown
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
@@ -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),