diff options
| author | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 13:56:32 +0300 |
|---|---|---|
| committer | unknown <jani@a193-229-222-105.elisa-laajakaista.fi> | 2005-09-30 13:56:32 +0300 |
| commit | 3bb53a7cea355fa14a7538a13e542a177f5cbabd (patch) | |
| tree | 50818821cc1e7a521e4cf0b23bf9a56ef17173ad /myisam/myisamchk.c | |
| parent | c8e0432dbdf5a41677f2c64b5a596badddf717b2 (diff) | |
| parent | 06e08e047a2bc9efc2432f394e0cfa26a0d494d7 (diff) | |
| download | mariadb-git-3bb53a7cea355fa14a7538a13e542a177f5cbabd.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0-icc
myisam/mi_open.c:
Auto merged
myisam/myisamchk.c:
Auto merged
myisam/myisamdef.h:
Auto merged
myisam/myisampack.c:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'myisam/myisamchk.c')
| -rw-r--r-- | myisam/myisamchk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 56c6e266ba8..a90495e5fcb 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -1261,7 +1261,7 @@ static void descript(MI_CHECK *param, register MI_INFO *info, my_string name) share->base.raid_chunksize); } if (share->options & (HA_OPTION_CHECKSUM | HA_OPTION_COMPRESS_RECORD)) - printf("Checksum: %23s\n",llstr(info->s->state.checksum,llbuff)); + printf("Checksum: %23s\n",llstr(info->state->checksum,llbuff)); ; if (share->options & HA_OPTION_DELAY_KEY_WRITE) printf("Keys are only flushed at close\n"); @@ -1576,7 +1576,7 @@ static int mi_sort_records(MI_CHECK *param, old_record_count=info->state->records; info->state->records=0; if (sort_info.new_data_file_type != COMPRESSED_RECORD) - share->state.checksum=0; + info->state->checksum=0; if (sort_record_index(&sort_param,info,keyinfo,share->state.key_root[sort_key], temp_buff, sort_key,new_file,update_index) || |