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/ha_partition.h | |
parent | 6131d708e889cd4f93490c22bfee00d0728edfd2 (diff) | |
parent | 3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff) | |
download | mariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz |
Automatic merge
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r-- | sql/ha_partition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h index b69ef7534aa..5437541bc9c 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -1099,7 +1099,7 @@ public: virtual int check(THD* thd, HA_CHECK_OPT *check_opt); virtual int repair(THD* thd, HA_CHECK_OPT *check_opt); virtual bool check_and_repair(THD *thd); - virtual bool auto_repair() const; + virtual bool auto_repair(int error) const; virtual bool is_crashed() const; private: |