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 /sql/table.cc | |
| parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
| parent | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff) | |
| download | mariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz | |
Automatic merge
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 7a337521040..d713ac1166c 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2383,8 +2383,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) |