summaryrefslogtreecommitdiff
path: root/sql/ha_partition.h
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-03-28 13:49:07 +0300
committerMichael Widenius <monty@askmonty.org>2012-03-28 13:49:07 +0300
commit3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (patch)
tree142e8c1fdf2e1cd20740c27716b4fb692895db41 /sql/ha_partition.h
parentc88e2679c60f56719b6d347c30374e69ffd3d5c4 (diff)
parent74b064933267f58b9201c46eb67454237d7664d3 (diff)
downloadmariadb-git-3bc932ec175ae9ac2fc6c0c5be29002819c9b102.tar.gz
Merge with 5.1
Diffstat (limited to 'sql/ha_partition.h')
-rw-r--r--sql/ha_partition.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
index 73d1c25c0c4..59449ef9634 100644
--- a/sql/ha_partition.h
+++ b/sql/ha_partition.h
@@ -1102,7 +1102,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: