parallel repair: style fixups

parent 381d56bb
...@@ -323,8 +323,7 @@ typedef struct st_io_cache_share ...@@ -323,8 +323,7 @@ typedef struct st_io_cache_share
int count; int count;
/* actual IO_CACHE that filled the buffer */ /* actual IO_CACHE that filled the buffer */
struct st_io_cache *active; struct st_io_cache *active;
/* the following will be implemented whenever the need arises */ #ifdef NOT_YET_IMPLEMENTED
#ifdef NOT_IMPLEMENTED
/* whether the structure should be free'd */ /* whether the structure should be free'd */
my_bool alloced; my_bool alloced;
#endif #endif
......
...@@ -358,7 +358,7 @@ typedef struct st_sort_info ...@@ -358,7 +358,7 @@ typedef struct st_sort_info
MI_CHECK *param; MI_CHECK *param;
enum data_file_type new_data_file_type; enum data_file_type new_data_file_type;
SORT_KEY_BLOCKS *key_block,*key_block_end; SORT_KEY_BLOCKS *key_block,*key_block_end;
uint kei, total_keys; uint current_key, total_keys;
my_off_t filelength,dupp,buff_length; my_off_t filelength,dupp,buff_length;
ha_rows max_records; ha_rows max_records;
char *buff; char *buff;
......
...@@ -3223,7 +3223,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param) ...@@ -3223,7 +3223,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param)
old_file=info->dfile; old_file=info->dfile;
info->dfile=info->rec_cache.file; info->dfile=info->rec_cache.file;
if (sort_info->kei) if (sort_info->current_key)
{ {
key=info->lastkey+info->s->base.max_key_length; key=info->lastkey+info->s->base.max_key_length;
if ((error=(*info->s->read_rnd)(info,sort_param->record,info->lastpos,0)) && if ((error=(*info->s->read_rnd)(info,sort_param->record,info->lastpos,0)) &&
...@@ -3234,7 +3234,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param) ...@@ -3234,7 +3234,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
for (i=0 ; i < sort_info->kei ; i++) for (i=0 ; i < sort_info->current_key ; i++)
{ {
uint key_length=_mi_make_key(info,i,key,sort_param->record,info->lastpos); uint key_length=_mi_make_key(info,i,key,sort_param->record,info->lastpos);
if (_mi_ck_delete(info,i,key,key_length)) if (_mi_ck_delete(info,i,key,key_length))
......
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