From daceefe370a71036df6e1ecb209e966d29bc2871 Mon Sep 17 00:00:00 2001 From: Luke Chen Date: Fri, 5 Jul 2019 12:27:29 +1000 Subject: Import wiredtiger: b50d65e8560446e2cd205594e07bbcaa2305b144 from branch mongodb-4.2 ref: d86b3a8a33..b50d65e856 for: 4.3.1 WT-4502 Assertion checking hazard pointers on page discard is too strong WT-4733 Change test/format to do longer-term repeatable read testing WT-4743 Fix memory leaks and core dumps in page-split error handling WT-4786 Coverity: Invalid format specifiers in printf-like invocations WT-4805 Modify error message verification for test_prepare04.py WT-4812 Fix the Python distribution script for Python3 changes WT-4818 Add debugging of bad read file descriptor when files are missing during recovery WT-4840 WT_CURSOR.modify must require explicit, snapshot-isolation transaction WT-4864 Coverity: Redundant NULL check WT-4866 Coverity: WT_SESSION.import can leak memory WT-4867 Skip assertion when reserved updates are seen WT-4882 Improve checkpoint performance when there are large metadata pages WT-4887 Skip read timestamp required assert during recovery WT-4888 Remove support for Berkeley DB WT-4891 WT_SESSION.verify memory allocation overrun WT-4895 Fix debug eviction mode so it chooses skew more randomly WT-4910 Port Windows SConstruct to Python 3 --- src/third_party/wiredtiger/src/block/block_ckpt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/third_party/wiredtiger/src/block') diff --git a/src/third_party/wiredtiger/src/block/block_ckpt.c b/src/third_party/wiredtiger/src/block/block_ckpt.c index db6b458d671..a968370c2a5 100644 --- a/src/third_party/wiredtiger/src/block/block_ckpt.c +++ b/src/third_party/wiredtiger/src/block/block_ckpt.c @@ -140,7 +140,7 @@ err: /* } /* Checkpoints don't need the original information, discard it. */ - if (checkpoint && ci != NULL) + if (checkpoint) __wt_block_ckpt_destroy(session, ci); return (ret); -- cgit v1.2.1