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/myisam/ha_myisam.h | |
| parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
| parent | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff) | |
| download | mariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz | |
Automatic merge
Diffstat (limited to 'storage/myisam/ha_myisam.h')
| -rw-r--r-- | storage/myisam/ha_myisam.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/myisam/ha_myisam.h b/storage/myisam/ha_myisam.h index ddf18ecbe14..4b600fd61c1 100644 --- a/storage/myisam/ha_myisam.h +++ b/storage/myisam/ha_myisam.h @@ -135,7 +135,11 @@ class ha_myisam: public handler int repair(THD* thd, HA_CHECK_OPT* check_opt); bool check_and_repair(THD *thd); bool is_crashed() const; - bool auto_repair() const { return myisam_recover_options != 0; } + bool auto_repair(int error) const + { + return (myisam_recover_options != 0 && + error == HA_ERR_CRASHED_ON_USAGE); + } int optimize(THD* thd, HA_CHECK_OPT* check_opt); int restore(THD* thd, HA_CHECK_OPT* check_opt); int backup(THD* thd, HA_CHECK_OPT* check_opt); |