Commit ffd5f8c8 authored by Sergey Petrunya's avatar Sergey Petrunya

Post-merge fixes:

- update ha_cassandra::start_bulk_insert() definition to match those in class handler.
parent 61412c0c
......@@ -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)))
......
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment