diff options
| author | unknown <serg@sergbook.mysql.com> | 2002-07-21 21:01:05 +0200 |
|---|---|---|
| committer | unknown <serg@sergbook.mysql.com> | 2002-07-21 21:01:05 +0200 |
| commit | 13b326f105eb6904aaa69115e244e52a7f71615b (patch) | |
| tree | 53f201506e53be3aefa1a3a6a15e5c06db699508 | |
| parent | 641d725dcb7cfe3cc881c921ff94c382f18774b2 (diff) | |
| download | mariadb-git-13b326f105eb6904aaa69115e244e52a7f71615b.tar.gz | |
parallel repair: style fixups
| -rw-r--r-- | include/my_sys.h | 3 | ||||
| -rw-r--r-- | include/myisam.h | 2 | ||||
| -rw-r--r-- | myisam/mi_check.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 664131e8187..b8c861288af 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -323,8 +323,7 @@ typedef struct st_io_cache_share int count; /* actual IO_CACHE that filled the buffer */ struct st_io_cache *active; - /* the following will be implemented whenever the need arises */ -#ifdef NOT_IMPLEMENTED +#ifdef NOT_YET_IMPLEMENTED /* whether the structure should be free'd */ my_bool alloced; #endif diff --git a/include/myisam.h b/include/myisam.h index cd70292d283..8e1be66331a 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -358,7 +358,7 @@ typedef struct st_sort_info MI_CHECK *param; enum data_file_type new_data_file_type; SORT_KEY_BLOCKS *key_block,*key_block_end; - uint kei, total_keys; + uint current_key, total_keys; my_off_t filelength,dupp,buff_length; ha_rows max_records; char *buff; diff --git a/myisam/mi_check.c b/myisam/mi_check.c index daecbb7ef2c..52ad02a3c1a 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3223,7 +3223,7 @@ static int sort_delete_record(MI_SORT_PARAM *sort_param) old_file=info->dfile; info->dfile=info->rec_cache.file; - if (sort_info->kei) + if (sort_info->current_key) { key=info->lastkey+info->s->base.max_key_length; 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) 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); if (_mi_ck_delete(info,i,key,key_length)) |