From 86abc397e89cb59b96b3573a403b39ea60a05c68 Mon Sep 17 00:00:00 2001 From: Hallvard Furuseth Date: Wed, 18 Nov 2015 16:30:24 +0100 Subject: [PATCH] mdbx: backport - ITS#8312 Fix loose pages in commit(nested txn). Change-Id: Ie335dcff0c87cfc13abf9b937f5d058d3ea9d841 --- CHANGES | 1 + mdb.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 81bee840..aba1a092 100644 --- a/CHANGES +++ b/CHANGES @@ -17,6 +17,7 @@ LMDB 0.9.17 Release Engineering Fix ITS#7971 mdb_txn_renew0() new reader slots Fix ITS#7969 use __sync_synchronize on non-x86 Fix ITS#8311 page_split from update_key + Fix ITS#8312 loose pages in nested txn Added mdb_txn_id() (ITS#7994) Added robust mutex support Miscellaneous cleanup/simplification diff --git a/mdb.c b/mdb.c index 31cc7c48..f906ab72 100644 --- a/mdb.c +++ b/mdb.c @@ -3786,7 +3786,7 @@ mdb_txn_commit(MDB_txn *txn) } /* Append our loose page list to parent's */ - for (lp = &parent->mt_loose_pgs; *lp; lp = &NEXT_LOOSE_PAGE(lp)) + for (lp = &parent->mt_loose_pgs; *lp; lp = &NEXT_LOOSE_PAGE(*lp)) ; *lp = txn->mt_loose_pgs; parent->mt_loose_count += txn->mt_loose_count;