Commit 049e92ad authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

[t:4764], remove setting of prepared transactions txn->state to TOKUTXN_LIVE...

[t:4764], remove setting of prepared transactions txn->state to TOKUTXN_LIVE before doing commit/abort

git-svn-id: file:///svn/toku/tokudb@42728 c7de825b-a66e-492c-adef-691d508d4ae1
parent 75f84168
...@@ -407,7 +407,6 @@ int toku_txn_commit_with_lsn(TOKUTXN txn, int nosync, YIELDF yield, void *yieldv ...@@ -407,7 +407,6 @@ int toku_txn_commit_with_lsn(TOKUTXN txn, int nosync, YIELDF yield, void *yieldv
// Effect: Among other things: if release_multi_operation_client_lock is true, then unlock that lock (even if an error path is taken) // Effect: Among other things: if release_multi_operation_client_lock is true, then unlock that lock (even if an error path is taken)
{ {
if (txn->state==TOKUTXN_PREPARING) { if (txn->state==TOKUTXN_PREPARING) {
txn->state=TOKUTXN_LIVE;
invalidate_xa_xid(&txn->xa_xid); invalidate_xa_xid(&txn->xa_xid);
toku_list_remove(&txn->prepared_txns_link); toku_list_remove(&txn->prepared_txns_link);
} }
...@@ -464,7 +463,6 @@ int toku_txn_abort_with_lsn(TOKUTXN txn, YIELDF yield, void *yieldv, LSN oplsn, ...@@ -464,7 +463,6 @@ int toku_txn_abort_with_lsn(TOKUTXN txn, YIELDF yield, void *yieldv, LSN oplsn,
// Effect: Ammong other things, if release_multi_operation_client_lock is true, then unlock that lock (even if an error path is taken) // Effect: Ammong other things, if release_multi_operation_client_lock is true, then unlock that lock (even if an error path is taken)
{ {
if (txn->state==TOKUTXN_PREPARING) { if (txn->state==TOKUTXN_PREPARING) {
txn->state=TOKUTXN_LIVE;
invalidate_xa_xid(&txn->xa_xid); invalidate_xa_xid(&txn->xa_xid);
toku_list_remove(&txn->prepared_txns_link); toku_list_remove(&txn->prepared_txns_link);
} }
......
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