diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-04-10 08:28:13 +0200 |
| commit | 16c5c53fc21b162844c38a87ac48205448ca1d2f (patch) | |
| tree | 7a50437d5f9da772ec8aaacab322e5f6c13e7305 /sql/filesort.cc | |
| parent | f860b2aad41cd1b5ed0438ea211dcd78eec82b94 (diff) | |
| parent | ed418461614d912fbb114053508b3fb09b1fc2f0 (diff) | |
| download | mariadb-git-16c5c53fc21b162844c38a87ac48205448ca1d2f.tar.gz | |
mysql 5.5.23 merge
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index bec43d98e9e..03379f2738a 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -219,7 +219,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, param.keys= table_sort.keys; if (memory_available < min_sort_memory) { - my_error(ER_OUT_OF_SORTMEMORY,MYF(ME_ERROR+ME_WAITTANG)); + my_error(ER_OUT_OF_SORTMEMORY,MYF(ME_ERROR + ME_FATALERROR)); goto err; } if (open_cached_file(&buffpek_pointers,mysql_tmpdir,TEMP_PREFIX, |