diff options
| author | unknown <ramil@mysql.com> | 2005-09-05 16:41:01 +0500 |
|---|---|---|
| committer | unknown <ramil@mysql.com> | 2005-09-05 16:41:01 +0500 |
| commit | 43b0448081cc5a2e79e598c32f96a95a85fd4aed (patch) | |
| tree | 2493207f50f811c98d8997a5e70c1942b480f720 /myisam/myisampack.c | |
| parent | aea2e857e0ca3959addca37c58f04ddb8d27a54a (diff) | |
| parent | 943f8335f11c30b6188589e484ceacd1b1b786f8 (diff) | |
| download | mariadb-git-43b0448081cc5a2e79e598c32f96a95a85fd4aed.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/home/ram/work/4.1.b4214
myisam/mi_check.c:
Auto merged
myisam/myisampack.c:
Auto merged
Diffstat (limited to 'myisam/myisampack.c')
| -rw-r--r-- | myisam/myisampack.c | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index c5db66ef209..f017e4d23ab 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -1675,6 +1675,7 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts) HUFF_COUNTS *count,*end_count; HUFF_TREE *tree; MI_INFO *isam_file=mrg->file[0]; + uint pack_version= (uint) isam_file->s->pack.version; DBUG_ENTER("compress_isam_file"); if (!(record=(byte*) my_alloca(isam_file->s->base.reclength))) @@ -1702,23 +1703,10 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts) huff_counts[i].tree->height+huff_counts[i].length_bits; } max_calc_length/=8; - if (max_calc_length < 254) - pack_ref_length=1; - else if (max_calc_length <= 65535) - pack_ref_length=3; - else - pack_ref_length=4; + pack_ref_length= calc_pack_length(pack_version, max_calc_length); record_count=0; - pack_blob_length=0; - if (isam_file->s->base.blobs) - { - if (mrg->max_blob_length < 254) - pack_blob_length=1; - else if (mrg->max_blob_length <= 65535) - pack_blob_length=3; - else - pack_blob_length=4; - } + pack_blob_length= isam_file->s->base.blobs ? + calc_pack_length(pack_version, mrg->max_blob_length) : 0; max_pack_length=pack_ref_length+pack_blob_length; mrg_reset(mrg); @@ -1874,9 +1862,10 @@ static int compress_isam_file(PACK_MRG_INFO *mrg, HUFF_COUNTS *huff_counts) } flush_bits(); length=(ulong) (file_buffer.pos-record_pos)-max_pack_length; - pack_length=save_pack_length(record_pos,length); + pack_length= save_pack_length(pack_version, record_pos, length); if (pack_blob_length) - pack_length+=save_pack_length(record_pos+pack_length,tot_blob_length); + pack_length+= save_pack_length(pack_version, record_pos + pack_length, + tot_blob_length); /* Correct file buffer if the header was smaller */ if (pack_length != max_pack_length) |