From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Fri, 19 Sep 2014 01:48:49 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
X-Git-Tag: OPENLDAP_REL_ENG_2_4_40^0
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=e648bdc22cd654d371a224a88973f986f67ba499;hp=43bd1468331664459e64e2a1fbaa0e7de457459e

Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 7ddb36e200..6cc343326e 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2626,6 +2626,7 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
 	if (!(flags & MDB_RDONLY)) {
 		if (!parent) {
 			txn = env->me_txn0;
+			txn->mt_flags = 0;
 			goto ok;
 		}
 		size += env->me_maxdbs * sizeof(MDB_cursor *);