summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-07-25 17:09:21 +0200
committerSergei Golubchik <sergii@pisem.net>2010-07-25 17:09:21 +0200
commit68f02c65ef09601591ec5cb9521aaa5bfde9309e (patch)
tree5476c26cacf28d1d5895e181fefd24129282852e /sql/ha_ndbcluster.cc
parent9d8ecf782b7f7b4322359aaca57162a08675d907 (diff)
parentcf86a5ae5284c744bc4cc727073387d0799da5c2 (diff)
downloadmariadb-git-68f02c65ef09601591ec5cb9521aaa5bfde9309e.tar.gz
merge with 5.1
Diffstat (limited to 'sql/ha_ndbcluster.cc')
-rw-r--r--sql/ha_ndbcluster.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc
index 9286670fc79..782b77eac51 100644
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
@@ -4232,7 +4232,7 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows)
/**
End of an insert.
*/
-int ha_ndbcluster::end_bulk_insert(bool abort)
+int ha_ndbcluster::end_bulk_insert()
{
int error= 0;
DBUG_ENTER("end_bulk_insert");