diff options
| author | unknown <serg@serg.mysql.com> | 2002-09-25 14:29:38 +0000 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2002-09-25 14:29:38 +0000 |
| commit | 31b0520e4954ec008c0c7526d4d50c3a061bc594 (patch) | |
| tree | 9aac5162f563b8abc63dbd9457db248b676f0b5d /myisam | |
| parent | a045a92924024a96058b7fc716d60243e36f8fa5 (diff) | |
| download | mariadb-git-31b0520e4954ec008c0c7526d4d50c3a061bc594.tar.gz | |
fixed bug in myisamchk -R mode
myisam/mi_check.c:
cleanups
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 6 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 5fecf707227..4669566fc8f 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -2947,14 +2947,12 @@ int sort_write_record(MI_SORT_PARAM *sort_param) ulong block_length,reclength; byte *from; byte block_buff[8]; - MI_INFO *info; SORT_INFO *sort_info=sort_param->sort_info; - MYISAM_SHARE *share; MI_CHECK *param=sort_info->param; + MI_INFO *info=sort_info->info; + MYISAM_SHARE *share=info->s; DBUG_ENTER("sort_write_record"); - info=sort_info->info; - share=info->s; if (sort_param->fix_datafile) { switch (sort_info->new_data_file_type) { diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 1239ad1ed9d..0d8d1430ce9 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -72,7 +72,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name); static int mi_sort_records(MI_CHECK *param, register MI_INFO *info, my_string name, uint sort_key, my_bool write_info, my_bool update_index); -static int sort_record_index(MI_SORT_PARAM *sort_param,MI_INFO *info, +static int sort_record_index(MI_SORT_PARAM *sort_param, MI_INFO *info, MI_KEYDEF *keyinfo, my_off_t page,uchar *buff,uint sortkey, File new_file, my_bool update_index); @@ -1470,6 +1470,7 @@ static int mi_sort_records(MI_CHECK *param, sort_info.info=info; sort_info.new_data_file_type=share->data_file_type; sort_param.fix_datafile=1; + sort_param.master=1; sort_param.filepos=share->pack.header_length; old_record_count=info->state->records; info->state->records=0; |