diff options
| author | serg@serg.mysql.com <> | 2001-08-29 13:43:50 +0200 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2001-08-29 13:43:50 +0200 |
| commit | e17126b231cd61a54cb2fc84fee80a51cdfe537d (patch) | |
| tree | c3a1ba795781aa218eebcd1e015bce769d05f6ca /myisam | |
| parent | 788bc3f43bb20915e5ae733f868f98cbce85fdcc (diff) | |
| parent | aeafb909e0636977a140eae10c7ac22149848226 (diff) | |
| download | mariadb-git-e17126b231cd61a54cb2fc84fee80a51cdfe537d.tar.gz | |
Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 5 |
1 files changed, 2 insertions, 3 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); |