Commit f20511cc authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:2788], add end_bulk_insert(bool abort) for mariadb

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@22036 c7de825b-a66e-492c-adef-691d508d4ae1
parent 4f92a37c
...@@ -2902,7 +2902,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) { ...@@ -2902,7 +2902,7 @@ void ha_tokudb::start_bulk_insert(ha_rows rows) {
// (ha_tokudb::write_row). If start_bulk_insert is called, then // (ha_tokudb::write_row). If start_bulk_insert is called, then
// this is guaranteed to be called. // this is guaranteed to be called.
// //
int ha_tokudb::end_bulk_insert() { int ha_tokudb::end_bulk_insert(bool abort) {
TOKUDB_DBUG_ENTER("ha_tokudb::end_bulk_insert"); TOKUDB_DBUG_ENTER("ha_tokudb::end_bulk_insert");
int error = 0; int error = 0;
THD* thd = ha_thd(); THD* thd = ha_thd();
...@@ -2977,6 +2977,9 @@ cleanup: ...@@ -2977,6 +2977,9 @@ cleanup:
TOKUDB_DBUG_RETURN(error ? error : loader_error); TOKUDB_DBUG_RETURN(error ? error : loader_error);
} }
int ha_tokudb::end_bulk_insert() {
return end_bulk_insert( false );
}
int ha_tokudb::is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_info) { int ha_tokudb::is_index_unique(bool* is_unique, DB_TXN* txn, DB* db, KEY* key_info) {
int error; int error;
......
...@@ -396,6 +396,7 @@ public: ...@@ -396,6 +396,7 @@ public:
void start_bulk_insert(ha_rows rows); void start_bulk_insert(ha_rows rows);
int end_bulk_insert(); int end_bulk_insert();
int end_bulk_insert(bool abort);
int prepare_index_scan(); int prepare_index_scan();
int prepare_index_key_scan( const uchar * key, uint key_len ); int prepare_index_key_scan( const uchar * key, uint key_len );
......
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