diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
| commit | ab83952f293ea46c00e421c81b81a394c9cae2b4 (patch) | |
| tree | 6a3e995bd1330828a0e988d896bca218863fc74c /storage/archive | |
| parent | 055b62f404ee0a0463ee8ff98a0e24c083b95f1d (diff) | |
| parent | 5267af5e9e5e601d4f4b1ef40730da1e36d38d9d (diff) | |
| download | mariadb-git-ab83952f293ea46c00e421c81b81a394c9cae2b4.tar.gz | |
10.0-base merge
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 75026f2a443..342f8be956e 100644 --- a/storage/archive/ha_archive.cc +++ b/storage/archive/ha_archive.cc @@ -1666,7 +1666,7 @@ int ha_archive::info(uint flag) turn will keep selects from causing a sync to occur. Basically, yet another optimizations to keep compression working well. */ -void ha_archive::start_bulk_insert(ha_rows rows) +void ha_archive::start_bulk_insert(ha_rows rows, uint flags) { DBUG_ENTER("ha_archive::start_bulk_insert"); if (!rows || rows >= ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT) diff --git a/storage/archive/ha_archive.h b/storage/archive/ha_archive.h index d1c4bfbc7fb..627267c7306 100644 --- a/storage/archive/ha_archive.h +++ b/storage/archive/ha_archive.h @@ -136,7 +136,7 @@ public: int optimize(THD* thd, HA_CHECK_OPT* check_opt); int repair(THD* thd, HA_CHECK_OPT* check_opt); int check_for_upgrade(HA_CHECK_OPT *check_opt); - void start_bulk_insert(ha_rows rows); + void start_bulk_insert(ha_rows rows, uint flags); int end_bulk_insert(); enum row_type get_row_type() const { |