diff options
| author | Michael Widenius <monty@askmonty.org> | 2012-03-28 13:58:14 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2012-03-28 13:58:14 +0300 |
| commit | bb6cc525280044eba19462a0d9ab24b67031feaa (patch) | |
| tree | f7d9c1a6fa0213f6a2f3a683ade44546c73609d9 /storage/maria/ma_open.c | |
| parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
| parent | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff) | |
| download | mariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz | |
Automatic merge
Diffstat (limited to 'storage/maria/ma_open.c')
| -rw-r--r-- | storage/maria/ma_open.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index 84da4f12f65..83ad41a9a38 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -1006,8 +1006,6 @@ err: tmp_name.length= strlen(name); _ma_report_error(save_errno, &tmp_name); } - if (save_errno == HA_ERR_OLD_FILE) /* uuid is different ? */ - save_errno= HA_ERR_CRASHED_ON_USAGE; /* the code to trigger auto-repair */ switch (errpos) { case 5: if (data_file >= 0) |