diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-29 16:24:21 -0400 |
| commit | c681d06f9b1b7a826008303b74ef48fe118fe0e4 (patch) | |
| tree | 8a4347a8719a65a224b41a0ad3bdb5931f264204 /myisam | |
| parent | 90a29133a51d1eb7c4f142c68c68df61a0baf163 (diff) | |
| parent | 04bf9cc7c6f17d9c6ab14a7521c1ab1708f50993 (diff) | |
| download | mariadb-git-c681d06f9b1b7a826008303b74ef48fe118fe0e4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index a3195ebce7f..5a81d221d2a 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -1370,7 +1370,8 @@ int mi_repair(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param,new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param,new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; info->s->state.dellink= HA_OFFSET_ERROR; @@ -2072,7 +2073,8 @@ int mi_repair_by_sort(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param, new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param, new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; if (param->testflag & T_UNPACK) @@ -2440,7 +2442,8 @@ int mi_repair_parallel(MI_CHECK *param, register MI_INFO *info, param->temp_filename); goto err; } - if (filecopy(param, new_file,info->dfile,0L,new_header_length, + if (new_header_length && + filecopy(param, new_file,info->dfile,0L,new_header_length, "datafile-header")) goto err; if (param->testflag & T_UNPACK) |