diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 14:53:31 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 14:53:31 +0200 |
| commit | ef5b6b197421fdc8c5c06fbaf5464e19821cf9de (patch) | |
| tree | 59360fefc6e32557541c3a47ec4df5cd10aee2df /storage/myisam | |
| parent | 2d48a1f2a3c3539a977839b94a9d3fe703666753 (diff) | |
| parent | f6493451f8c59e140121a21fbfae8583d12630b5 (diff) | |
| download | mariadb-git-ef5b6b197421fdc8c5c06fbaf5464e19821cf9de.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
sql/mysql_priv.h:
Auto merged
Diffstat (limited to 'storage/myisam')
| -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) |