From: Hallvard Furuseth <hallvard@openldap.org>
Date: Wed, 28 Oct 2015 08:37:23 +0000 (+0100)
Subject: Fix MDB_NOSYNC,MDB_NOMETASYNC thinko
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ee9c4a30e4d3ce203efcd3f1726f515f45913cc;p=openldap

Fix MDB_NOSYNC,MDB_NOMETASYNC thinko
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 901f6c40d3..d4888beb74 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -3750,7 +3750,7 @@ mdb_env_write_meta(MDB_txn *txn)
 		toggle, txn->mt_dbs[MAIN_DBI].md_root));
 
 	env = txn->mt_env;
-	flags = txn->mt_flags & env->me_flags;
+	flags = txn->mt_flags | env->me_flags;
 	mp = env->me_metas[toggle];
 	mapsize = env->me_metas[toggle ^ 1]->mm_mapsize;
 	/* Persist any increases of mapsize config */