diff options
| author | unknown <kaa@kaamos.(none)> | 2008-03-12 10:59:15 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-03-12 10:59:15 +0300 |
| commit | 09f8a4af63b5366505dfe56cb53e0ac26042eea1 (patch) | |
| tree | 8e11254a0548ae9300008dac84cbfef339906922 /sql/filesort.cc | |
| parent | 4d09306dd19820a742b003417d83f76f5d3633f3 (diff) | |
| parent | 0abcb8ca5e3662d230446907469dc4facbb755ad (diff) | |
| download | mariadb-git-09f8a4af63b5366505dfe56cb53e0ac26042eea1.tar.gz | |
Merge kaamos.(none):/data/src/mysql-5.0
into kaamos.(none):/data/src/opt/mysql-5.0-opt
client/mysql.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
mysql-test/r/view.result:
Manual merge.
mysql-test/t/view.test:
Manual merge.
scripts/mysql_config.sh:
Manual merge.
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, |