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/archive | |
parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
parent | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff) | |
download | mariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz |
Automatic merge
Diffstat (limited to 'storage/archive')
-rw-r--r-- | storage/archive/ha_archive.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 653a13b242d..6f0c0b529fb 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -125,7 +125,9 @@ public: int free_share(); int init_archive_writer(); int init_archive_reader(); - bool auto_repair() const { return 1; } // For the moment we just do this + // Always try auto_repair in case of HA_ERR_CRASHED_ON_USAGE + bool auto_repair(int error) const + { return error == HA_ERR_CRASHED_ON_USAGE; } int read_data_header(azio_stream *file_to_read); void position(const uchar *record); int info(uint); |