diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2014-10-29 15:20:46 +0300 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2014-10-29 15:20:46 +0300 |
| commit | e4521f8cae6134d3c32b2b8cb3e24a54c90de627 (patch) | |
| tree | a110921037bd605d7bba552eedd4dbbaf3cebebc /sql/multi_range_read.cc | |
| parent | 100b10d8efbcbc936d742b87aacf49dab037333f (diff) | |
| parent | 35f69fc42e4b4004f6972df25669aac3f0782085 (diff) | |
| download | mariadb-git-e4521f8cae6134d3c32b2b8cb3e24a54c90de627.tar.gz | |
Merge
Diffstat (limited to 'sql/multi_range_read.cc')
| -rw-r--r-- | sql/multi_range_read.cc | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sql/multi_range_read.cc b/sql/multi_range_read.cc index 4665957528f..2d22adce8d9 100644 --- a/sql/multi_range_read.cc +++ b/sql/multi_range_read.cc @@ -471,17 +471,18 @@ void Mrr_ordered_index_reader::position() void Mrr_ordered_index_reader::resume_read() { TABLE *table= file->get_table(); - if (read_was_interrupted) + + if (!read_was_interrupted) + return; + + KEY *used_index= &table->key_info[file->active_index]; + key_restore(table->record[0], saved_key_tuple, + used_index, used_index->key_length); + if (saved_primary_key) { - KEY *used_index= &table->key_info[file->active_index]; - key_restore(table->record[0], saved_key_tuple, - used_index, used_index->key_length); - if (saved_primary_key) - { - key_restore(table->record[0], saved_primary_key, - &table->key_info[table->s->primary_key], - table->key_info[table->s->primary_key].key_length); - } + key_restore(table->record[0], saved_primary_key, + &table->key_info[table->s->primary_key], + table->key_info[table->s->primary_key].key_length); } } |