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

[t:3875], hopefully last fix

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@34000 c7de825b-a66e-492c-adef-691d508d4ae1
parent 4d1ea90d
...@@ -4816,6 +4816,7 @@ int ha_tokudb::read_data_from_range_query_buff(uchar* buf, bool need_val) { ...@@ -4816,6 +4816,7 @@ int ha_tokudb::read_data_from_range_query_buff(uchar* buf, bool need_val) {
error = read_primary_key( buf, active_index, &curr_val, &curr_key); error = read_primary_key( buf, active_index, &curr_val, &curr_key);
} }
else { else {
extract_hidden_primary_key(active_index, &curr_key);
// need to extract a val and place it into buf // need to extract a val and place it into buf
if (unpack_entire_row) { if (unpack_entire_row) {
// get val info // get val info
...@@ -4825,7 +4826,6 @@ int ha_tokudb::read_data_from_range_query_buff(uchar* buf, bool need_val) { ...@@ -4825,7 +4826,6 @@ int ha_tokudb::read_data_from_range_query_buff(uchar* buf, bool need_val) {
curr_pos += val_size; curr_pos += val_size;
curr_val.data = curr_val_buff; curr_val.data = curr_val_buff;
curr_val.size = val_size; curr_val.size = val_size;
extract_hidden_primary_key(active_index, &curr_key);
error = unpack_row(buf,&curr_val, &curr_key, active_index); error = unpack_row(buf,&curr_val, &curr_key, active_index);
} }
else { else {
......
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