aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoward Chu <hyc@symas.com>2021-04-09 14:21:15 +0100
committerHoward Chu <hyc@symas.com>2021-04-09 14:21:15 +0100
commit5fe22ac766e0c1f918f63516c97b8b14fa996aef (patch)
tree72a92ebe1d38468adc160ce5bd7e8f6fe76037c0
parentMerge pull request #7650 (diff)
downloadmonero-5fe22ac766e0c1f918f63516c97b8b14fa996aef.tar.xz
ITS#9496 fix mdb_env_open bug from #8704
Broken in 9c6eb75c656363176a55c63c81803feb3cfa614d
-rw-r--r--external/db_drivers/liblmdb/mdb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/external/db_drivers/liblmdb/mdb.c b/external/db_drivers/liblmdb/mdb.c
index 96c741f66..6314d5775 100644
--- a/external/db_drivers/liblmdb/mdb.c
+++ b/external/db_drivers/liblmdb/mdb.c
@@ -4882,9 +4882,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);
@@ -4984,6 +4981,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
{