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/myisampack.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/myisampack.c')
| -rw-r--r-- | myisam/myisampack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 225f7f1a830..114e80d8f1a 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -2967,7 +2967,7 @@ static int save_state(MI_INFO *isam_file,PACK_MRG_INFO *mrg,my_off_t new_length, share->state.key_root[key]= HA_OFFSET_ERROR; for (key=0 ; key < share->state.header.max_block_size ; key++) share->state.key_del[key]= HA_OFFSET_ERROR; - share->state.checksum=crc; /* Save crc here */ + isam_file->state->checksum=crc; /* Save crc here */ share->changed=1; /* Force write of header */ share->state.open_count=0; share->global_changed=0; @@ -3003,7 +3003,7 @@ static int save_state_mrg(File file,PACK_MRG_INFO *mrg,my_off_t new_length, state.dellink= HA_OFFSET_ERROR; state.version=(ulong) time((time_t*) 0); mi_clear_all_keys_active(state.key_map); - state.checksum=crc; + state.state.checksum=crc; if (isam_file->s->base.keys) isamchk_neaded=1; state.changed=STATE_CHANGED | STATE_NOT_ANALYZED; /* Force check of table */ |