From 6ac52386bbecb90dd4ceb7bd2737ef5eb7abb1ad Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 23 Jan 2013 16:24:04 +0100 Subject: [PATCH] fix the failing federated.federated_innodb test: update all start_bulk_insert() methods to the new signature. --- sql/sql_insert.cc | 1 + storage/archive/ha_archive.cc | 2 +- storage/archive/ha_archive.h | 2 +- storage/federated/ha_federated.cc | 2 +- storage/federated/ha_federated.h | 2 +- storage/federatedx/ha_federatedx.cc | 2 +- storage/federatedx/ha_federatedx.h | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c0eabd3a2f2..cb887d88f56 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1,5 +1,6 @@ /* Copyright (c) 2000, 2011, Oracle and/or its affiliates. + Copyright (c) 2009, 2013, Monty Program Ab. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by 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 { diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 6cfd95b97b6..b554c344f62 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -1979,7 +1979,7 @@ int ha_federated::write_row(uchar *buf) @details Initializes memory structures required for bulk insert. */ -void ha_federated::start_bulk_insert(ha_rows rows) +void ha_federated::start_bulk_insert(ha_rows rows, uint flags) { uint page_size; DBUG_ENTER("ha_federated::start_bulk_insert"); diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index 6583d438c4d..fc2c4740cc0 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -209,7 +209,7 @@ public: int open(const char *name, int mode, uint test_if_locked); // required int close(void); // required - void start_bulk_insert(ha_rows rows); + void start_bulk_insert(ha_rows rows, uint flags); int end_bulk_insert(); int write_row(uchar *buf); int update_row(const uchar *old_data, uchar *new_data); diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 9ec68a13039..e1c2a38964a 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -2126,7 +2126,7 @@ int ha_federatedx::write_row(uchar *buf) @details Initializes memory structures required for bulk insert. */ -void ha_federatedx::start_bulk_insert(ha_rows rows) +void ha_federatedx::start_bulk_insert(ha_rows rows, uint flags) { uint page_size; DBUG_ENTER("ha_federatedx::start_bulk_insert"); diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index 3af05387cb2..dcbbe534262 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -390,7 +390,7 @@ public: int open(const char *name, int mode, uint test_if_locked); // required int close(void); // required - void start_bulk_insert(ha_rows rows); + void start_bulk_insert(ha_rows rows, uint flags); int end_bulk_insert(); int write_row(uchar *buf); int update_row(const uchar *old_data, uchar *new_data);