diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-11-19 22:33:47 +0100 |
| commit | 95b37a254b0797499b4a940ca8eb8fa907a7664f (patch) | |
| tree | bcd57843b07d10746160f485e039446bf4bd616e /storage/myisam/myisamchk.c | |
| parent | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff) | |
| parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
| download | mariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz | |
Merge MariaDB 5.1->5.2
Diffstat (limited to 'storage/myisam/myisamchk.c')
| -rw-r--r-- | storage/myisam/myisamchk.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 592426a3690..8c54d7f0411 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -1032,7 +1032,7 @@ static int myisamchk(HA_CHECK *param, char * filename) { /* Change temp file to org file */ VOID(my_close(info->dfile,MYF(MY_WME))); /* Close new file */ error|=change_to_newfile(filename,MI_NAME_DEXT,DATA_TMP_EXT, - raid_chunks, + 0, raid_chunks, MYF(0)); if (mi_open_datafile(info,info->s, NULL, -1)) error=1; @@ -1165,12 +1165,9 @@ end2: { if (param->out_flag & O_NEW_DATA) error|=change_to_newfile(filename,MI_NAME_DEXT,DATA_TMP_EXT, - raid_chunks, + param->backup_time, raid_chunks, ((param->testflag & T_BACKUP_DATA) ? MYF(MY_REDEL_MAKE_BACKUP) : MYF(0))); - if (param->out_flag & O_NEW_INDEX) - error|=change_to_newfile(filename,MI_NAME_IEXT,INDEX_TMP_EXT,0, - MYF(0)); } VOID(fflush(stdout)); VOID(fflush(stderr)); if (param->error_printed) @@ -1242,7 +1239,8 @@ static void descript(HA_CHECK *param, register MI_INFO *info, char * name) } pos=buff; if (share->state.changed & STATE_CRASHED) - strmov(buff,"crashed"); + strmov(buff, share->state.changed & STATE_CRASHED_ON_REPAIR ? + "crashed on repair" : "crashed"); else { if (share->state.open_count) |