Commit 05d15465 authored by John Esmet's avatar John Esmet Committed by Yoni Fogel

refs #5101 locked_txn_id is dead code, so set txn->id to toku_txn_id instead (which barfs)


git-svn-id: file:///svn/toku/tokudb@47322 c7de825b-a66e-492c-adef-691d508d4ae1
parent 7332e765
...@@ -236,12 +236,6 @@ toku_txn_prepare (DB_TXN *txn, uint8_t gid[DB_GID_SIZE]) { ...@@ -236,12 +236,6 @@ toku_txn_prepare (DB_TXN *txn, uint8_t gid[DB_GID_SIZE]) {
return toku_txn_xa_prepare(txn, &xid); return toku_txn_xa_prepare(txn, &xid);
} }
static uint32_t
locked_txn_id(DB_TXN *txn) {
uint32_t r = toku_txn_id(txn);
return r;
}
static int static int
toku_txn_txn_stat (DB_TXN *txn, struct txn_stat **txn_stat) { toku_txn_txn_stat (DB_TXN *txn, struct txn_stat **txn_stat) {
XMALLOC(*txn_stat); XMALLOC(*txn_stat);
...@@ -318,13 +312,13 @@ txn_func_init(DB_TXN *txn) { ...@@ -318,13 +312,13 @@ txn_func_init(DB_TXN *txn) {
STXN(commit); STXN(commit);
STXN(abort_with_progress); STXN(abort_with_progress);
STXN(commit_with_progress); STXN(commit_with_progress);
STXN(id);
STXN(txn_stat); STXN(txn_stat);
#undef STXN #undef STXN
#define SUTXN(name) txn->name = toku_txn_ ## name #define SUTXN(name) txn->name = toku_txn_ ## name
SUTXN(prepare); SUTXN(prepare);
SUTXN(xa_prepare); SUTXN(xa_prepare);
#undef SUTXN #undef SUTXN
txn->id = toku_txn_id;
txn->id64 = toku_txn_id64; txn->id64 = toku_txn_id64;
} }
......
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