Commit 0b3f48b1 authored by Bradley C. Kuszmaul's avatar Bradley C. Kuszmaul Committed by Yoni Fogel

Fixes #1848 (add parent txn to xstillopen).

git-svn-id: file:///svn/toku/tokudb@13131 c7de825b-a66e-492c-adef-691d508d4ae1
parent 25d6b8f4
......@@ -1523,7 +1523,9 @@ static int
log_open_txn (TOKULOGGER logger, TOKUTXN txn, void *UU(v))
{
if (toku_logger_txn_parent(txn)==NULL) { // only have to log the open root transactions
int r = toku_log_xstillopen(logger, NULL, 0, toku_txn_get_txnid(txn));
int r = toku_log_xstillopen(logger, NULL, 0,
toku_txn_get_txnid(txn),
toku_txn_get_txnid(toku_logger_txn_parent(txn)));
assert(r==0);
}
return 0;
......
......@@ -96,7 +96,7 @@ const struct logtype logtypes[] = {
{"fassociate", 'f', FA{{"FILENUM", "filenum", 0},
{"BYTESTRING", "fname", 0}, // pathname of file
NULLFIELD}},
{"xstillopen", 's', FA{{"TXNID", "txnid", 0}, NULLFIELD}}, // only record root transactions
{"xstillopen", 's', FA{{"TXNID", "txnid", 0}, {"TXNID", "parent", 0}, NULLFIELD}}, // only record root transactions
// Reords produced by transactions
{"commit", 'C', FA{{"TXNID", "txnid", 0},NULLFIELD}},
{"xabort", 'q', FA{{"TXNID", "txnid", 0},NULLFIELD}},
......
......@@ -299,7 +299,7 @@ static int toku_recover_backward_fassociate (struct logtype_fassociate *l, struc
return 0;
}
static int toku_recover_xstillopen (LSN UU(lsn), TXNID UU(txnid)) {
static int toku_recover_xstillopen (LSN UU(lsn), TXNID UU(txnid), TXNID UU(parent)) {
return 0;
}
......
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