diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-07-25 17:09:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-07-25 17:09:21 +0200 |
| commit | 68f02c65ef09601591ec5cb9521aaa5bfde9309e (patch) | |
| tree | 5476c26cacf28d1d5895e181fefd24129282852e /sql/ha_partition.cc | |
| parent | 9d8ecf782b7f7b4322359aaca57162a08675d907 (diff) | |
| parent | cf86a5ae5284c744bc4cc727073387d0799da5c2 (diff) | |
| download | mariadb-git-68f02c65ef09601591ec5cb9521aaa5bfde9309e.tar.gz | |
merge with 5.1
Diffstat (limited to 'sql/ha_partition.cc')
| -rw-r--r-- | sql/ha_partition.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index 9026a901671..0d60832b085 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -3416,18 +3416,17 @@ ha_rows ha_partition::guess_bulk_insert_rows() SYNOPSIS end_bulk_insert() - abort 1 if table will be deleted (error condition) RETURN VALUE >0 Error code 0 Success Note: end_bulk_insert can be called without start_bulk_insert - being called, see bug¤44108. + being called, see bug#44108. */ -int ha_partition::end_bulk_insert(bool abort) +int ha_partition::end_bulk_insert() { int error= 0; uint i; @@ -3440,7 +3439,7 @@ int ha_partition::end_bulk_insert(bool abort) { int tmp; if (bitmap_is_set(&m_bulk_insert_started, i) && - (tmp= m_file[i]->ha_end_bulk_insert(abort))) + (tmp= m_file[i]->ha_end_bulk_insert())) error= tmp; } bitmap_clear_all(&m_bulk_insert_started); |