diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 032696250407f..1484244a42819 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1162,24 +1162,14 @@ IO_AND_CPU_COST ha_archive::rnd_pos_time(ha_rows rows) */ int ha_archive::index_read(uchar *buf, const uchar *key, uint key_len, enum ha_rkey_function find_flag) -{ - int rc; - DBUG_ENTER("ha_archive::index_read"); - rc= index_read_idx(buf, active_index, key, key_len, find_flag); - DBUG_RETURN(rc); -} - - -int ha_archive::index_read_idx(uchar *buf, uint index, const uchar *key, - uint key_len, enum ha_rkey_function find_flag) { int rc; bool found= 0; - KEY *mkey= &table->key_info[index]; + KEY *mkey= &table->key_info[active_index]; current_k_offset= mkey->key_part->offset; current_key= key; current_key_len= key_len; - DBUG_ENTER("ha_archive::index_read_idx"); + DBUG_ENTER("ha_archive::index_read"); rc= rnd_init(TRUE); diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 8a6c592257edb..39cf4b9a94298 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -115,11 +115,9 @@ class ha_archive final : public handler ulonglong blocks) override; IO_AND_CPU_COST rnd_pos_time(ha_rows rows) override; int index_init(uint keynr, bool sorted) override; - virtual int index_read(uchar * buf, const uchar * key, - uint key_len, enum ha_rkey_function find_flag) - override; - virtual int index_read_idx(uchar * buf, uint index, const uchar * key, - uint key_len, enum ha_rkey_function find_flag); + int index_read(uchar * buf, const uchar * key, + uint key_len, enum ha_rkey_function find_flag) + override; int index_next(uchar * buf) override; int open(const char *name, int mode, uint test_if_locked) override; int close(void) override;