diff options
| author | gkodinov/kgeorge@macbook.gmz <> | 2006-09-27 13:03:41 +0300 |
|---|---|---|
| committer | gkodinov/kgeorge@macbook.gmz <> | 2006-09-27 13:03:41 +0300 |
| commit | a01e7b12ce119bba8e3f2ef141d13e49c46dd4f3 (patch) | |
| tree | 65907e2a768f8c8264d23443578b32087e11b8f4 /storage | |
| parent | fb077c0efd02bc1503f0267ce4d7c94117f3e505 (diff) | |
| parent | 903387afc00fbc367aefbc32f973ea3b52d85fd9 (diff) | |
| download | mariadb-git-a01e7b12ce119bba8e3f2ef141d13e49c46dd4f3.tar.gz | |
Merge macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.0-opt
into macbook.gmz:/Users/kgeorge/mysql/work/B21174-5.1-opt
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/myisam/mi_check.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 91c04866b5a..a7685bf653d 100644 --- a/storage/myisam/mi_check.c +++ b/storage/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) @@ -2466,7 +2468,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) |