diff options
| author | unknown <evgen@moonbone.local> | 2008-02-12 21:58:41 +0300 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2008-02-12 21:58:41 +0300 |
| commit | d83cd2149b1dde23b14d8878abc14bc9b21b89e3 (patch) | |
| tree | 59258d31d87f9ef7d2c84578724c8c6672c67545 /sql | |
| parent | a87fe95118f4097615d5dbd4ff6eeb6c3a74f919 (diff) | |
| parent | d8eab9769309b36b96c2239d436fdb93b175a760 (diff) | |
| download | mariadb-git-d83cd2149b1dde23b14d8878abc14bc9b21b89e3.tar.gz | |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/31590-bug-5.0-opt-mysql
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/filesort.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 43b079e83d5..a85f9caefbe 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -215,8 +215,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, sort_keys= table_sort.sort_keys; if (memavl < min_sort_memory) { - my_error(ER_OUTOFMEMORY,MYF(ME_ERROR+ME_WAITTANG), - thd->variables.sortbuff_size); + my_error(ER_OUT_OF_SORTMEMORY,MYF(ME_ERROR+ME_WAITTANG)); goto err; } if (open_cached_file(&buffpek_pointers,mysql_tmpdir,TEMP_PREFIX, |