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 /sql/table.cc | |
| parent | c88e2679c60f56719b6d347c30374e69ffd3d5c4 (diff) | |
| parent | 74b064933267f58b9201c46eb67454237d7664d3 (diff) | |
| download | mariadb-git-3bc932ec175ae9ac2fc6c0c5be29002819c9b102.tar.gz | |
Merge with 5.1
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 5bcc85e3cc8..5b1db9ef1e4 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2380,8 +2380,7 @@ partititon_err: HA_OPEN_IGNORE_IF_LOCKED) | ha_open_flags)))) { /* Set a flag if the table is crashed and it can be auto. repaired */ - share->crashed= ((ha_err == HA_ERR_CRASHED_ON_USAGE) && - outparam->file->auto_repair() && + share->crashed= (outparam->file->auto_repair(ha_err) && !(ha_open_flags & HA_OPEN_FOR_REPAIR)); switch (ha_err) |