From: Howard Chu <hyc@openldap.org>
Date: Fri, 9 Apr 2021 13:06:33 +0000 (+0100)
Subject: ITS#9496 fix mdb_env_open bug from #8704
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=557ab60606f3cbcc96f670318e4e88022869b33b;p=thirdparty%2Fopenldap.git

ITS#9496 fix mdb_env_open bug from #8704

Broken in 3585a1eb977326c7e178c53f4eef1fdc81b46e63
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 835ea3a718..a6cc3ab60f 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -5361,9 +5361,6 @@ mdb_env_open2(MDB_env *env, int prev)
 #endif
 	env->me_maxpg = env->me_mapsize / env->me_psize;
 
-	if (env->me_txns)
-		env->me_txns->mti_txnid = meta.mm_txnid;
-
 #if MDB_DEBUG
 	{
 		MDB_meta *meta = mdb_env_pick_meta(env);
@@ -5463,6 +5460,9 @@ static int ESECT
 mdb_env_share_locks(MDB_env *env, int *excl)
 {
 	int rc = 0;
+	MDB_meta *meta = mdb_env_pick_meta(env);
+
+	env->me_txns->mti_txnid = meta->mm_txnid;
 
 #ifdef _WIN32
 	{