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 7ddb36e200b4c605ffe136fe2a91ab455179bd02..6cc343326efeb8543db073671e92625723daf938 100644 (file)
--- 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 *);