diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-09-25 16:44:53 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-09-25 16:44:53 +0500 |
| commit | b91735a60e52502e2f9a92f381112f87d64bb1dc (patch) | |
| tree | 768b7191e2bd33c795921a2f7d677a880bfe11b0 /myisam | |
| parent | 82703ea494353bfa08fb6c1f73581c4a57b8a4be (diff) | |
| parent | adb7fc9ba0c57553cbd63c7c050fccd6798f6970 (diff) | |
| download | mariadb-git-b91735a60e52502e2f9a92f381112f87d64bb1dc.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1.15428
into mysql.com:/home/hf/work/mysql-5.0-mrg
myisam/mi_check.c:
Auto merged
mysys/my_chsize.c:
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) |