diff options
| author | serg@serg.mysql.com <> | 2003-03-13 18:46:40 +0100 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2003-03-13 18:46:40 +0100 |
| commit | ff86765a4d934b1c70e850b2c7a55f133258fa0e (patch) | |
| tree | d51478732b0ccb235d7c76c56b256dbd1953e905 /sql/filesort.cc | |
| parent | 6c81552dd3edc97ba2bfea9bccaff9d1ecb2b132 (diff) | |
| download | mariadb-git-ff86765a4d934b1c70e850b2c7a55f133258fa0e.tar.gz | |
fix for crash with small sort_buffer
Diffstat (limited to 'sql/filesort.cc')
| -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 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); |