From cde437db9050784fbec4b6eb00727155a9d7eede Mon Sep 17 00:00:00 2001 From: Zardosht Kasheff Date: Sat, 18 Apr 2009 19:47:42 +0000 Subject: [PATCH] addresses #1710 remove dead code git-svn-id: file:///svn/mysql/tokudb-engine/src@11425 c7de825b-a66e-492c-adef-691d508d4ae1 --- storage/tokudb/ha_tokudb.cc | 37 ------------------------------------- storage/tokudb/ha_tokudb.h | 1 - 2 files changed, 38 deletions(-) diff --git a/storage/tokudb/ha_tokudb.cc b/storage/tokudb/ha_tokudb.cc index 9b091fc9471..e41bf50c3a1 100644 --- a/storage/tokudb/ha_tokudb.cc +++ b/storage/tokudb/ha_tokudb.cc @@ -3071,43 +3071,6 @@ int ha_tokudb::read_row(uchar * buf, uint keynr, DBT const *row, DBT const *foun TOKUDB_DBUG_RETURN(0); } -// -// This is only used to read whole keys -// According to InnoDB handlerton: Positions an index cursor to the index -// specified in keynr. Fetches the row if any -// Parameters: -// [out] buf - buffer for the returned row -// keynr - index to use -// [in] key - key value, according to InnoDB, if NULL, -// position cursor at start or end of index, -// not sure if this is done now -// key_len - length of key -// find_flag - according to InnoDB, search flags from my_base.h -// Returns: -// 0 on success -// HA_ERR_KEY_NOT_FOUND if not found (per InnoDB), -// error otherwise -// -int ha_tokudb::index_read_idx(uchar * buf, uint keynr, const uchar * key, uint key_len, enum ha_rkey_function find_flag) { - TOKUDB_DBUG_ENTER("ha_tokudb::index_read_idx"); - int error; - table->in_use->status_var.ha_read_key_count++; - current_row.flags = DB_DBT_REALLOC; - active_index = MAX_KEY; - - error = share->key_file[keynr]->get(share->key_file[keynr], transaction, pack_key(&last_key, keynr, key_buff, key, key_len, COL_NEG_INF), ¤t_row, 0); - if (error == DB_NOTFOUND) { - error = HA_ERR_KEY_NOT_FOUND; - goto cleanup; - } - if (!error) { - error = read_row(buf, keynr, ¤t_row, &last_key); - } -cleanup: - TOKUDB_DBUG_RETURN(error); -} - - // // context information for the heaviside functions. // Context information includes data necessary diff --git a/storage/tokudb/ha_tokudb.h b/storage/tokudb/ha_tokudb.h index 97ccbf93cf9..ccec1e67115 100644 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@ -337,7 +337,6 @@ public: int index_init(uint index, bool sorted); int index_end(); int index_read(uchar * buf, const uchar * key, uint key_len, enum ha_rkey_function find_flag); - int index_read_idx(uchar * buf, uint index, const uchar * key, uint key_len, enum ha_rkey_function find_flag); #if 0 int index_read_last(uchar * buf, const uchar * key, uint key_len); #endif