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/maria/maria_chk.c | |
| parent | 01d41622ba4cdb99327f98d0d1c1772ad842c66a (diff) | |
| parent | a967802ae94e1b0ce75436648446621a381838e7 (diff) | |
| download | mariadb-git-95b37a254b0797499b4a940ca8eb8fa907a7664f.tar.gz | |
Merge MariaDB 5.1->5.2
Diffstat (limited to 'storage/maria/maria_chk.c')
| -rw-r--r-- | storage/maria/maria_chk.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/storage/maria/maria_chk.c b/storage/maria/maria_chk.c index 4e19d5878ea..714b9511279 100644 --- a/storage/maria/maria_chk.c +++ b/storage/maria/maria_chk.c @@ -1211,7 +1211,7 @@ static int maria_chk(HA_CHECK *param, char *filename) { /* Change temp file to org file */ VOID(my_close(info->dfile.file, MYF(MY_WME))); /* Close new file */ error|=maria_change_to_newfile(filename,MARIA_NAME_DEXT,DATA_TMP_EXT, - MYF(0)); + 0, MYF(0)); if (_ma_open_datafile(info,info->s, NullS, -1)) error=1; param->out_flag&= ~O_NEW_DATA; /* We are using new datafile */ @@ -1349,11 +1349,9 @@ end2: { if (param->out_flag & O_NEW_DATA) error|=maria_change_to_newfile(filename,MARIA_NAME_DEXT,DATA_TMP_EXT, + param->backup_time, ((param->testflag & T_BACKUP_DATA) ? MYF(MY_REDEL_MAKE_BACKUP) : MYF(0))); - if (param->out_flag & O_NEW_INDEX) - error|=maria_change_to_newfile(filename,MARIA_NAME_IEXT,INDEX_TMP_EXT, - MYF(0)); } if (opt_transaction_logging && share->base.born_transactional && !error && @@ -1457,7 +1455,8 @@ static void descript(HA_CHECK *param, register MARIA_HA *info, char *name) printf("UUID: %s\n", buff); 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) |