summaryrefslogtreecommitdiff
path: root/sql/ha_partition.cc
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2012-03-28 13:58:14 +0300
committerMichael Widenius <monty@askmonty.org>2012-03-28 13:58:14 +0300
commitbb6cc525280044eba19462a0d9ab24b67031feaa (patch)
treef7d9c1a6fa0213f6a2f3a683ade44546c73609d9 /sql/ha_partition.cc
parent6131d708e889cd4f93490c22bfee00d0728edfd2 (diff)
parent3bc932ec175ae9ac2fc6c0c5be29002819c9b102 (diff)
downloadmariadb-git-bb6cc525280044eba19462a0d9ab24b67031feaa.tar.gz
Automatic merge
Diffstat (limited to 'sql/ha_partition.cc')
-rw-r--r--sql/ha_partition.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc
index 03a879815e8..5363d65407b 100644
--- a/sql/ha_partition.cc
+++ b/sql/ha_partition.cc
@@ -1218,7 +1218,7 @@ bool ha_partition::check_and_repair(THD *thd)
@retval FALSE Cannot be auto repaired
*/
-bool ha_partition::auto_repair() const
+bool ha_partition::auto_repair(int error) const
{
DBUG_ENTER("ha_partition::auto_repair");
@@ -1226,7 +1226,7 @@ bool ha_partition::auto_repair() const
As long as we only support one storage engine per table,
we can use the first partition for this function.
*/
- DBUG_RETURN(m_file[0]->auto_repair());
+ DBUG_RETURN(m_file[0]->auto_repair(error));
}