database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

fix the failing federated.federated_innodb test:

Browse Source 
update all start_bulk_insert() methods to the new signature.
This commit is contained in:
Sergei Golubchik
2013-01-23 16:24:04 +01:00
parent eb809ec061
commit 6ac52386bb
7 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_insert.cc
View File

@@ -1,5 +1,6 @@
/* /*
Copyright (c) 2000, 2011, Oracle and/or its affiliates. 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 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 it under the terms of the GNU General Public License as published by

2
storage/archive/ha_archive.cc
View File

@@ -1669,7 +1669,7 @@ int ha_archive::info(uint flag)
turn will keep selects from causing a sync to occur. turn will keep selects from causing a sync to occur.
Basically, yet another optimizations to keep compression working well. 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"); DBUG_ENTER("ha_archive::start_bulk_insert");
if (!rows || rows >= ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT) if (!rows || rows >= ARCHIVE_MIN_ROWS_TO_USE_BULK_INSERT)

2
storage/archive/ha_archive.h
View File

@@ -136,7 +136,7 @@ public:
int optimize(THD* thd, HA_CHECK_OPT* check_opt); int optimize(THD* thd, HA_CHECK_OPT* check_opt);
int repair(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); 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(); int end_bulk_insert();
enum row_type get_row_type() const enum row_type get_row_type() const
{ {

2
storage/federated/ha_federated.cc
View File

@@ -1979,7 +1979,7 @@ int ha_federated::write_row(uchar *buf)
@details Initializes memory structures required for bulk insert. @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; uint page_size;
DBUG_ENTER("ha_federated::start_bulk_insert"); DBUG_ENTER("ha_federated::start_bulk_insert");

2
storage/federated/ha_federated.h
View File

@@ -209,7 +209,7 @@ public:
int open(const char *name, int mode, uint test_if_locked); // required int open(const char *name, int mode, uint test_if_locked); // required
int close(void); // 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 end_bulk_insert();
int write_row(uchar *buf); int write_row(uchar *buf);
int update_row(const uchar *old_data, uchar *new_data); int update_row(const uchar *old_data, uchar *new_data);

2
storage/federatedx/ha_federatedx.cc
View File

@@ -2126,7 +2126,7 @@ int ha_federatedx::write_row(uchar *buf)
@details Initializes memory structures required for bulk insert. @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; uint page_size;
DBUG_ENTER("ha_federatedx::start_bulk_insert"); DBUG_ENTER("ha_federatedx::start_bulk_insert");

2
storage/federatedx/ha_federatedx.h
View File

@@ -390,7 +390,7 @@ public:
int open(const char *name, int mode, uint test_if_locked); // required int open(const char *name, int mode, uint test_if_locked); // required
int close(void); // 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 end_bulk_insert();
int write_row(uchar *buf); int write_row(uchar *buf);
int update_row(const uchar *old_data, uchar *new_data); int update_row(const uchar *old_data, uchar *new_data);