diff options
| author | kaa@kaamos.(none) <> | 2008-03-12 10:59:15 +0300 |
|---|---|---|
| committer | kaa@kaamos.(none) <> | 2008-03-12 10:59:15 +0300 |
| commit | d0eb90501d8865a01af1140e5bb5a04c03dd2d50 (patch) | |
| tree | 8e11254a0548ae9300008dac84cbfef339906922 /sql/filesort.cc | |
| parent | 687d2131de8b90b188128130072ed65412625465 (diff) | |
| parent | 3a87bbfe42f23c562a37d63b4203dc24ed464632 (diff) | |
| download | mariadb-git-d0eb90501d8865a01af1140e5bb5a04c03dd2d50.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.0
into kaamos.(none):/data/src/opt/mysql-5.0-opt
Diffstat (limited to 'sql/filesort.cc')
| -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 132e91363f3..70fc6937b59 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -222,8 +222,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, |