diff options
| author | unknown <serg@serg.mysql.com> | 2003-03-13 19:00:49 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-03-13 19:00:49 +0100 |
| commit | 5a667a50a8f29b86e9482ee84ec4fb1cdc78d576 (patch) | |
| tree | 991baef75ee9cd6c23a57b15e600c6d68c4d996c | |
| parent | aca9fe2dfab1d45c5a08fed214aebc555845d4fb (diff) | |
| parent | ead5a5deab1737dc5ea19c409272cfc78fed819a (diff) | |
| download | mariadb-git-5a667a50a8f29b86e9482ee84ec4fb1cdc78d576.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.0/
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
| -rw-r--r-- | sql/filesort.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 2ac05ef0496..b212e2cb366 100644 --- 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), |