diff options
| author | sergefp@mysql.com <> | 2004-09-22 16:42:06 +0400 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2004-09-22 16:42:06 +0400 |
| commit | df267c6c0acc2e2176485458630dbfcd060dc82c (patch) | |
| tree | 290c6910722083f55d3b1d3b20ba6049e1cd2d02 /myisam/myisampack.c | |
| parent | 87a8e833aeeb8c8bdf89de493279e4a68bb92709 (diff) | |
| parent | 6e0ba8e615a7d58277dd4b78def08c7af02c3a10 (diff) | |
| download | mariadb-git-df267c6c0acc2e2176485458630dbfcd060dc82c.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack
Diffstat (limited to 'myisam/myisampack.c')
| -rw-r--r-- | myisam/myisampack.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 872fcb49faf..4b784641266 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -2041,7 +2041,11 @@ static int save_state(MI_INFO *isam_file,PACK_MRG_INFO *mrg,my_off_t new_length, share->state.split=(ha_rows) mrg->records; share->state.version=(ulong) time((time_t*) 0); share->state.key_map=0; - share->state.state.key_file_length=share->base.keystart; + /* + Don't save key_file_length here, keep key_file_length of original file + so "myisamchk -rq" can use this value (this is necessary because index + size cannot be easily calculated for fulltext keys) + */ for (key=0 ; key < share->base.keys ; key++) share->state.key_root[key]= HA_OFFSET_ERROR; for (key=0 ; key < share->state.header.max_block_size ; key++) |