diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-08-30 14:24:15 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-08-30 14:24:15 +0300 |
| commit | 16a2502047f67e40598eb40173462c3003da6a5f (patch) | |
| tree | cf659112c115928deaad93ccc16a5372813439b3 | |
| parent | a054969476bfcb14f268110274d7dcf48314e8a7 (diff) | |
| download | mariadb-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
| -rw-r--r-- | myisam/myisamchk.c | 5 | ||||
| -rw-r--r-- | myisam/myisampack.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 8ee92debf56..aa0713437f4 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -200,7 +200,7 @@ static struct option long_options[] = static void print_version(void) { - printf("%s Ver 1.50 for %s at %s\n",my_progname,SYSTEM_TYPE, + printf("%s Ver 1.51 for %s at %s\n",my_progname,SYSTEM_TYPE, MACHINE_TYPE); } @@ -608,7 +608,8 @@ static int myisamchk(MI_CHECK *param, my_string filename) info->s->state.header.file_version[3] != myisam_file_magic[3] || (set_charset && set_charset->number != share->state.header.language))) { - check_param.language=set_charset->number; + if (set_charset) + check_param.language=set_charset->number; if (recreate_table(&check_param, &info,filename)) { VOID(fprintf(stderr, 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)* |