Commit 76d5f4e3 authored by Rich Prohaska's avatar Rich Prohaska

#150 cleanup cursor when a txn is retired

parent 8a52b1e1
...@@ -8270,7 +8270,6 @@ void ha_tokudb::cleanup_txn(DB_TXN *txn) { ...@@ -8270,7 +8270,6 @@ void ha_tokudb::cleanup_txn(DB_TXN *txn) {
int r = cursor->c_close(cursor); int r = cursor->c_close(cursor);
assert(r == 0); assert(r == 0);
cursor = NULL; cursor = NULL;
remove_from_trx_handler_list();
} }
} }
......
...@@ -647,6 +647,7 @@ static void abort_txn_with_progress(DB_TXN* txn, THD* thd) { ...@@ -647,6 +647,7 @@ static void abort_txn_with_progress(DB_TXN* txn, THD* thd) {
static void tokudb_cleanup_handlers(tokudb_trx_data *trx, DB_TXN *txn) { static void tokudb_cleanup_handlers(tokudb_trx_data *trx, DB_TXN *txn) {
LIST *e; LIST *e;
while ((e = trx->handlers)) { while ((e = trx->handlers)) {
trx->handlers = list_delete(trx->handlers, e);
ha_tokudb *handler = (ha_tokudb *) e->data; ha_tokudb *handler = (ha_tokudb *) e->data;
handler->cleanup_txn(txn); handler->cleanup_txn(txn);
} }
......
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