summaryrefslogtreecommitdiff
path: root/myisam/myisampack.c
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-08-30 14:24:15 +0300
committerunknown <monty@hundin.mysql.fi>2001-08-30 14:24:15 +0300
commit16a2502047f67e40598eb40173462c3003da6a5f (patch)
treecf659112c115928deaad93ccc16a5372813439b3 /myisam/myisampack.c
parenta054969476bfcb14f268110274d7dcf48314e8a7 (diff)
downloadmariadb-git-16a2502047f67e40598eb40173462c3003da6a5f.tar.gz
Fixed problem in myisampack with blobs
myisam/myisamchk.c: Fixes bug when not using --set-character-set myisam/myisampack.c: Fixed problem with blobs
Diffstat (limited to 'myisam/myisampack.c')
-rw-r--r--myisam/myisampack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c
index 557b4887b82..c0c23f28d6c 100644
--- a/myisam/myisampack.c
+++ b/myisam/myisampack.c
@@ -251,7 +251,7 @@ static struct option long_options[] =
static void print_version(void)
{
- printf("%s Ver 1.9 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);
+ printf("%s Ver 1.10 for %s on %s\n",my_progname,SYSTEM_TYPE,MACHINE_TYPE);
}
static void usage(void)
@@ -1670,7 +1670,7 @@ static int compress_isam_file(MRG_INFO *mrg, HUFF_COUNTS *huff_counts)
max_calc_length+=huff_counts[i].tree->height;
else if (huff_counts[i].field_type == FIELD_BLOB ||
huff_counts[i].field_type == FIELD_VARCHAR)
- max_calc_length=huff_counts[i].tree->height*huff_counts[i].max_length + huff_counts[i].length_bits +1;
+ max_calc_length+=huff_counts[i].tree->height*huff_counts[i].max_length + huff_counts[i].length_bits +1;
else
max_calc_length+=
(huff_counts[i].field_length - huff_counts[i].max_zero_fill)*