summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsueloverso <sue@wiredtiger.com>2014-12-15 12:08:09 -0500
committersueloverso <sue@wiredtiger.com>2014-12-15 12:08:09 -0500
commit17607db025adfbdc38f3843075d6d9fc940f54c5 (patch)
treeee1d6c6fb7993ef2b2a5a36968bd503a6155a481
parent39f9aae06816bac1ffc34f3c64456dba8f23be50 (diff)
parentcedf8cfe69bf964629aab498feb20a0b1ab77bc0 (diff)
downloadmongo-17607db025adfbdc38f3843075d6d9fc940f54c5.tar.gz
Merge pull request #1477 from wiredtiger/printlog-compressed
Fix use of 'compressed' flag for printlog.
-rw-r--r--src/txn/txn_log.c2
-rw-r--r--test/suite/test_txn07.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/txn/txn_log.c b/src/txn/txn_log.c
index 73fe35284b5..ae7641020be 100644
--- a/src/txn/txn_log.c
+++ b/src/txn/txn_log.c
@@ -430,7 +430,7 @@ __txn_printlog(
p = LOG_SKIP_HEADER(rawrec->data);
end = (const uint8_t *)rawrec->data + rawrec->size;
logrec = (WT_LOG_RECORD *)rawrec->data;
- compressed = F_ISSET(rawrec, WT_LOG_RECORD_COMPRESSED);
+ compressed = F_ISSET(logrec, WT_LOG_RECORD_COMPRESSED);
/* First, peek at the log record type. */
WT_RET(__wt_logrec_read(session, &p, end, &rectype));
diff --git a/test/suite/test_txn07.py b/test/suite/test_txn07.py
index 3ba9d4d17ec..fe203e07b30 100644
--- a/test/suite/test_txn07.py
+++ b/test/suite/test_txn07.py
@@ -242,5 +242,10 @@ class test_txn07(wttest.WiredTigerTestCase, suite_subprocess):
self.assertEqual(cwrites > 0, True)
self.assertEqual((cfails > 0 or csmall > 0), True)
+ #
+ # Run printlog and make sure it exits with zero status.
+ #
+ self.runWt(['-h', self.backup_dir, 'printlog'], outfilename='printlog.out')
+
if __name__ == '__main__':
wttest.run()