diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-09-28 10:36:04 +0200 |
| commit | 70255e85094e27597de49c404a867ad48b7e7bc3 (patch) | |
| tree | bcfe3c1689f5158834701b1dd5acdb6ccfe1b3b9 /myisam | |
| parent | c316933e602dbd8144e13254bc517f4e108032c3 (diff) | |
| parent | ca5e29475c8ae52035214c710be04bcb1ed13177 (diff) | |
| download | mariadb-git-70255e85094e27597de49c404a867ad48b7e7bc3.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
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) |