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 /storage/archive | |
| parent | 9d8ecf782b7f7b4322359aaca57162a08675d907 (diff) | |
| parent | cf86a5ae5284c744bc4cc727073387d0799da5c2 (diff) | |
| download | mariadb-git-68f02c65ef09601591ec5cb9521aaa5bfde9309e.tar.gz | |
merge with 5.1
Diffstat (limited to 'storage/archive')
| -rw-r--r-- | storage/archive/ha_archive.cc | 2 | ||||
| -rw-r--r-- | storage/archive/ha_archive.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc index 97d9f071b1f..922db30c9d9 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1555,7 +1555,7 @@ void ha_archive::start_bulk_insert(ha_rows rows) Other side of start_bulk_insert, is end_bulk_insert. Here we turn off the bulk insert flag, and set the share dirty so that the next select will call sync for us. */ -int ha_archive::end_bulk_insert(bool table_will_be_deleted) +int ha_archive::end_bulk_insert() { DBUG_ENTER("ha_archive::end_bulk_insert"); bulk_insert= FALSE; diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index 22f8302982d..ab630ed22fd 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -134,7 +134,7 @@ public: int optimize(THD* thd, HA_CHECK_OPT* check_opt); int repair(THD* thd, HA_CHECK_OPT* check_opt); void start_bulk_insert(ha_rows rows); - int end_bulk_insert(bool table_will_be_deleted); + int end_bulk_insert(); enum row_type get_row_type() const { return ROW_TYPE_COMPRESSED; |