diff options
| author | unknown <tim@white.box> | 2001-08-30 13:18:06 -0400 |
|---|---|---|
| committer | unknown <tim@white.box> | 2001-08-30 13:18:06 -0400 |
| commit | e6a8e97c48729d310012a8058b70c66c38be36cb (patch) | |
| tree | 953b2c369d546eaed430ccd468ea8cf2315e42a6 /myisam | |
| parent | e39aaf80738a21402eadf09eb42576bbb47fac0b (diff) | |
| parent | 16a2502047f67e40598eb40173462c3003da6a5f (diff) | |
| download | mariadb-git-e6a8e97c48729d310012a8058b70c66c38be36cb.tar.gz | |
Merge work.mysql.com:/home/bk/mysql into white.box:/home/tim/my/3
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 5 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 5 | ||||
| -rw-r--r-- | myisam/myisampack.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index fd327b96e6d..587f90e0929 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1111,6 +1111,7 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, SORT_INFO *sort_info= ¶m->sort_info; DBUG_ENTER("mi_repair"); + sort_info->buff=sort_info->record=0; start_records=info->state->records; new_header_length=(param->testflag & T_UNPACK) ? 0L : share->pack.header_length; @@ -1329,9 +1330,7 @@ err: } mi_mark_crashed_on_repair(info); } - if (sort_info->record) - my_free(sort_info->record,MYF(0)); - + my_free(sort_info->record,MYF(MY_ALLOW_ZERO_PTR)); my_free(sort_info->buff,MYF(MY_ALLOW_ZERO_PTR)); VOID(end_io_cache(¶m->read_cache)); info->opt_flag&= ~(READ_CACHE_USED | WRITE_CACHE_USED); 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)* |