Commit 4ebf9555 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4058], fix bug

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@35882 c7de825b-a66e-492c-adef-691d508d4ae1
parent ca9dc9c2
...@@ -7220,7 +7220,8 @@ int ha_tokudb::tokudb_add_index( ...@@ -7220,7 +7220,8 @@ int ha_tokudb::tokudb_add_index(
else { else {
rw_unlock(&share->num_DBs_lock); rw_unlock(&share->num_DBs_lock);
rw_lock_taken = false; rw_lock_taken = false;
prelocked_right_range_size = 0;
prelocked_left_range_size = 0;
struct smart_dbt_bf_info bf_info; struct smart_dbt_bf_info bf_info;
bf_info.ha = this; bf_info.ha = this;
// you need the val if you have a clustering index and key_read is not 0; // you need the val if you have a clustering index and key_read is not 0;
...@@ -7271,17 +7272,19 @@ int ha_tokudb::tokudb_add_index( ...@@ -7271,17 +7272,19 @@ int ha_tokudb::tokudb_add_index(
while (cursor_ret_val != DB_NOTFOUND || ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) > 0)) { while (cursor_ret_val != DB_NOTFOUND || ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) > 0)) {
if ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) == 0) { if ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) == 0) {
invalidate_bulk_fetch(); invalidate_bulk_fetch(); // reset the buffers
cursor_ret_val = tmp_cursor->c_getf_next(tmp_cursor, DB_PRELOCKED, smart_dbt_bf_callback, &bf_info); cursor_ret_val = tmp_cursor->c_getf_next(tmp_cursor, DB_PRELOCKED, smart_dbt_bf_callback, &bf_info);
if (cursor_ret_val != DB_NOTFOUND && cursor_ret_val != 0) { if (cursor_ret_val != DB_NOTFOUND && cursor_ret_val != 0) {
error = cursor_ret_val; error = cursor_ret_val;
goto cleanup; goto cleanup;
} }
} }
// do this check in case the the c_getf_next did not put anything into the buffer because
// there was no more data
if ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) == 0) { if ((bytes_used_in_range_query_buff - curr_range_query_buff_offset) == 0) {
break; break;
} }
// get key info // at this point, we know the range query buffer has at least one key/val pair
uchar* curr_pos = range_query_buff+curr_range_query_buff_offset; uchar* curr_pos = range_query_buff+curr_range_query_buff_offset;
u_int32_t key_size = *(u_int32_t *)curr_pos; u_int32_t key_size = *(u_int32_t *)curr_pos;
......
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