diff options
| author | unknown <kaa@polly.(none)> | 2007-10-23 15:52:27 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.(none)> | 2007-10-23 15:52:27 +0400 |
| commit | 619bb76ba7a15b813548595c0454f858d6536323 (patch) | |
| tree | ce56a12b5a2f424947e5354da47984a4b6b8331a /sql/filesort.cc | |
| parent | e259d46103f743de343c78e4a88b13ebd274e05a (diff) | |
| parent | bbce18c303f1779ee5386b4f1aedf3de3e19b97c (diff) | |
| download | mariadb-git-619bb76ba7a15b813548595c0454f858d6536323.tar.gz | |
Merge polly.(none):/home/kaa/src/opt/bug31742/my50-bug28550
into polly.(none):/home/kaa/src/opt/bug31742/my51-bug28550
sql/filesort.cc:
SCCS merged
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index b6a5d844eac..c074f90e780 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -556,7 +556,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, file->unlock_row(); /* It does not make sense to read more keys in case of a fatal error */ if (thd->net.report_error) - DBUG_RETURN(HA_POS_ERROR); + break; } if (quick_select) { @@ -573,6 +573,9 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, file->ha_rnd_end(); } + if (thd->net.report_error) + DBUG_RETURN(HA_POS_ERROR); + /* Signal we should use orignal column read and write maps */ sort_form->column_bitmaps_set(save_read_set, save_write_set); |