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/myisam | |
| parent | c88e2679c60f56719b6d347c30374e69ffd3d5c4 (diff) | |
| parent | 74b064933267f58b9201c46eb67454237d7664d3 (diff) | |
| download | mariadb-git-3bc932ec175ae9ac2fc6c0c5be29002819c9b102.tar.gz | |
Merge with 5.1
Diffstat (limited to 'storage/myisam')
| -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 3a3b5536a30..99d0a1b3369 100644 --- a/storage/myisam/ha_myisam.h +++ b/storage/myisam/ha_myisam.h @@ -127,7 +127,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); |