diff options
author | Michael Widenius <monty@askmonty.org> | 2012-03-28 13:49:07 +0300 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2012-03-28 13:49:07 +0300 |
commit | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (patch) | |
tree | 142e8c1fdf2e1cd20740c27716b4fb692895db41 /storage/maria/ma_open.c | |
parent | c88e2679c60f56719b6d347c30374e69ffd3d5c4 (diff) | |
parent | 74b064933267f58b9201c46eb67454237d7664d3 (diff) | |
download | mariadb-git-3bc932ec175ae9ac2fc6c0c5be29002819c9b102.tar.gz |
Merge with 5.1
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 2ffbfecb854..d3e758ada58 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -987,8 +987,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) |