Commit 3e280928 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:1925], remove unused variable current_row

git-svn-id: file:///svn/mysql/tokudb-engine/src@13869 c7de825b-a66e-492c-adef-691d508d4ae1
parent 4e0a3e4e
...@@ -1291,7 +1291,6 @@ int ha_tokudb::open(const char *name, int mode, uint test_if_locked) { ...@@ -1291,7 +1291,6 @@ int ha_tokudb::open(const char *name, int mode, uint test_if_locked) {
} }
thr_lock_data_init(&share->lock, &lock, NULL); thr_lock_data_init(&share->lock, &lock, NULL);
bzero((void *) &current_row, sizeof(current_row));
/* Fill in shared structure, if needed */ /* Fill in shared structure, if needed */
pthread_mutex_lock(&share->mutex); pthread_mutex_lock(&share->mutex);
...@@ -1492,7 +1491,7 @@ int ha_tokudb::__close(int mutex_is_locked) { ...@@ -1492,7 +1491,7 @@ int ha_tokudb::__close(int mutex_is_locked) {
my_free(alloc_ptr, MYF(MY_ALLOW_ZERO_PTR)); my_free(alloc_ptr, MYF(MY_ALLOW_ZERO_PTR));
rec_buff = NULL; rec_buff = NULL;
alloc_ptr = NULL; alloc_ptr = NULL;
ha_tokudb::reset(); // current_row buffer ha_tokudb::reset();
TOKUDB_DBUG_RETURN(free_share(share, mutex_is_locked)); TOKUDB_DBUG_RETURN(free_share(share, mutex_is_locked));
} }
...@@ -3868,7 +3867,6 @@ cleanup: ...@@ -3868,7 +3867,6 @@ cleanup:
int ha_tokudb::rnd_init(bool scan) { int ha_tokudb::rnd_init(bool scan) {
TOKUDB_DBUG_ENTER("ha_tokudb::rnd_init"); TOKUDB_DBUG_ENTER("ha_tokudb::rnd_init");
int error; int error;
current_row.flags = DB_DBT_REALLOC;
range_lock_grabbed = false; range_lock_grabbed = false;
if (scan) { if (scan) {
DB* db = share->key_file[primary_key]; DB* db = share->key_file[primary_key];
...@@ -4194,13 +4192,6 @@ int ha_tokudb::reset(void) { ...@@ -4194,13 +4192,6 @@ int ha_tokudb::reset(void) {
TOKUDB_DBUG_ENTER("ha_tokudb::reset"); TOKUDB_DBUG_ENTER("ha_tokudb::reset");
key_read = 0; key_read = 0;
using_ignore = 0; using_ignore = 0;
if (current_row.flags & (DB_DBT_MALLOC | DB_DBT_REALLOC)) {
current_row.flags = 0;
if (current_row.data) {
free(current_row.data);
current_row.data = 0;
}
}
TOKUDB_DBUG_RETURN(0); TOKUDB_DBUG_RETURN(0);
} }
......
...@@ -111,11 +111,6 @@ private: ...@@ -111,11 +111,6 @@ private:
// //
DBT last_key; DBT last_key;
// //
// current row pointed to by ha_tokudb's cursor
// TODO: make sure current_row gets set properly
//
DBT current_row;
//
// pointer used for multi_alloc of key_buff, key_buff2, primary_key_buff // pointer used for multi_alloc of key_buff, key_buff2, primary_key_buff
// //
void *alloc_ptr; void *alloc_ptr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment