diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-12-24 08:36:22 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-12-24 08:36:22 +0400 |
| commit | ffd5f8c8d4d48167852418cd1a1b17bdb2022e39 (patch) | |
| tree | 0784f8954212b9b7b9e75cfd5c4d5b571c290128 | |
| parent | 61412c0c31138ca2e08636c10823bc55e6a7a84c (diff) | |
| download | mariadb-git-ffd5f8c8d4d48167852418cd1a1b17bdb2022e39.tar.gz | |
Post-merge fixes:
- update ha_cassandra::start_bulk_insert() definition to match those in class handler.
| -rw-r--r-- | storage/cassandra/ha_cassandra.cc | 2 | ||||
| -rw-r--r-- | storage/cassandra/ha_cassandra.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/cassandra/ha_cassandra.cc b/storage/cassandra/ha_cassandra.cc index 5e04c7749d6..ad6fcf081fa 100644 --- a/storage/cassandra/ha_cassandra.cc +++ b/storage/cassandra/ha_cassandra.cc @@ -2033,7 +2033,7 @@ int ha_cassandra::write_row(uchar *buf) } -void ha_cassandra::start_bulk_insert(ha_rows rows) +void ha_cassandra::start_bulk_insert(ha_rows rows, uint flags) { int ires; if (!se && (ires= connect_and_check_options(table))) diff --git a/storage/cassandra/ha_cassandra.h b/storage/cassandra/ha_cassandra.h index ecd8bdb57e3..a57a754979c 100644 --- a/storage/cassandra/ha_cassandra.h +++ b/storage/cassandra/ha_cassandra.h @@ -208,7 +208,7 @@ public: virtual double read_time(uint, uint, ha_rows rows) { return (double) rows / 20.0+1; } - virtual void start_bulk_insert(ha_rows rows); + virtual void start_bulk_insert(ha_rows rows, uint flags); virtual int end_bulk_insert(); virtual int reset(); |