diff options
| author | unknown <monty@mishka.mysql.com> | 2005-09-12 18:48:17 +0300 |
|---|---|---|
| committer | unknown <monty@mishka.mysql.com> | 2005-09-12 18:48:17 +0300 |
| commit | 90ca6d15b3c560672c8ea8963d57c6bac48978f2 (patch) | |
| tree | 77696e4dc0f25ba656ed3f04ff1f1a2bf32d9c69 /sql/filesort.cc | |
| parent | e98e15db9b05da3b4c1ad5d788f2c6e5a3b78a15 (diff) | |
| download | mariadb-git-90ca6d15b3c560672c8ea8963d57c6bac48978f2.tar.gz | |
Review fixes since last pull
Fix for bug #13025; Server crash in filesort because wrong call to handler::position()
client/mysqltest.c:
Code cleanup during review
mysql-test/r/innodb.result:
Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
mysql-test/t/innodb.test:
Added test case for bug #13025; Server crash in filesort because wrong call to handler::position()
sql/filesort.cc:
Don't call handler::position() if row was not found
sql/item_cmpfunc.cc:
Indentation changes
sql/sql_select.cc:
Moved variable to outer level
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 75b114fc140..63a8515020b 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -443,7 +443,7 @@ static ha_rows find_all_keys(SORTPARAM *param, SQL_SELECT *select, ha_store_ptr(ref_pos,ref_length,record); // Position to row record+=sort_form->db_record_offset; } - else + else if (!error) file->position(sort_form->record[0]); } if (error && error != HA_ERR_RECORD_DELETED) |