From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sat, 10 Aug 2013 10:29:45 +0000 (+0200)
Subject: mdb_txn_commit(): Always commit if MDB_TXN_SPILLS.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_36~7^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5645812f41b66ca2bf26ff7367f4a5348a4d491e;p=openldap

mdb_txn_commit(): Always commit if MDB_TXN_SPILLS.

Checking dirty_list was insufficient after a spill
with no named databases and no positioned cursors.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index a407edac7a..02c7f067e3 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2851,7 +2851,8 @@ mdb_txn_commit(MDB_txn *txn)
 
 	mdb_cursors_close(txn, 0);
 
-	if (!txn->mt_u.dirty_list[0].mid && !(txn->mt_flags & MDB_TXN_DIRTY))
+	if (!txn->mt_u.dirty_list[0].mid &&
+		!(txn->mt_flags & (MDB_TXN_DIRTY|MDB_TXN_SPILLS)))
 		goto done;
 
 	DPRINTF("committing txn %"Z"u %p on mdbenv %p, root page %"Z"u",