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.h | |
| parent | 9d8ecf782b7f7b4322359aaca57162a08675d907 (diff) | |
| parent | cf86a5ae5284c744bc4cc727073387d0799da5c2 (diff) | |
| download | mariadb-git-68f02c65ef09601591ec5cb9521aaa5bfde9309e.tar.gz | |
merge with 5.1
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 e1339abc081..c8c45d72b26 100644 --- a/sql/ha_partition.h +++ b/sql/ha_partition.h @@ -364,7 +364,7 @@ public: virtual int delete_row(const uchar * buf); virtual int delete_all_rows(void); virtual void start_bulk_insert(ha_rows rows); - virtual int end_bulk_insert(bool); + virtual int end_bulk_insert(); private: ha_rows guess_bulk_insert_rows(); void start_part_bulk_insert(THD *thd, uint part_id); |