summaryrefslogtreecommitdiff
path: root/storage/archive
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-23 16:24:04 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-23 16:24:04 +0100
commit6ac52386bbecb90dd4ceb7bd2737ef5eb7abb1ad (patch)
tree631411256858e22c35e522501cf0050d92706f51 /storage/archive
parenteb809ec06123365a3adbcdf7f314ff3f1b691619 (diff)
downloadmariadb-git-6ac52386bbecb90dd4ceb7bd2737ef5eb7abb1ad.tar.gz
fix the failing federated.federated_innodb test:
update all start_bulk_insert() methods to the new signature.
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/ha_archive.cc2
-rw-r--r--storage/archive/ha_archive.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/archive/ha_archive.cc b/storage/archive/ha_archive.cc
index d40971e4adf..5d6253a2a9f 100644
--- a/storage/archive/ha_archive.cc
+++ b/storage/archive/ha_archive.cc
@@ -1669,7 +1669,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
{