Commit 5d2d9bfd authored by Rich Prohaska's avatar Rich Prohaska

#206 support mariadb 10.0.10 start_bulk_insert api change

parent ea3286b3
...@@ -3253,8 +3253,13 @@ bool ha_tokudb::may_table_be_empty(DB_TXN *txn) { ...@@ -3253,8 +3253,13 @@ bool ha_tokudb::may_table_be_empty(DB_TXN *txn) {
return ret_val; return ret_val;
} }
#if MYSQL_VERSION_ID >= 100000
void ha_tokudb::start_bulk_insert(ha_rows rows, uint flags) {
TOKUDB_HANDLER_DBUG_ENTER("%llu %u txn %p", (unsigned long long) rows, flags, transaction);
#else
void ha_tokudb::start_bulk_insert(ha_rows rows) { void ha_tokudb::start_bulk_insert(ha_rows rows) {
TOKUDB_HANDLER_DBUG_ENTER("txn %p", transaction); TOKUDB_HANDLER_DBUG_ENTER("%llu txn %p", (unsigned long long) rows, transaction);
#endif
THD* thd = ha_thd(); THD* thd = ha_thd();
tokudb_trx_data* trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot); tokudb_trx_data* trx = (tokudb_trx_data *) thd_data_get(thd, tokudb_hton->slot);
delay_updating_ai_metadata = true; delay_updating_ai_metadata = true;
......
...@@ -562,8 +562,11 @@ class ha_tokudb : public handler { ...@@ -562,8 +562,11 @@ class ha_tokudb : public handler {
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);
int delete_row(const uchar * buf); int delete_row(const uchar * buf);
#if MYSQL_VERSION_ID >= 100000
void start_bulk_insert(ha_rows rows, uint flags);
#else
void start_bulk_insert(ha_rows rows); void start_bulk_insert(ha_rows rows);
#endif
int end_bulk_insert(); int end_bulk_insert();
int end_bulk_insert(bool abort); int end_bulk_insert(bool abort);
......
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