Commit 4b615434 authored by Howard Chu's avatar Howard Chu
Browse files

ITS#9496 fix mdb_env_open bug from #8704

Broken in af2f8cc8
parent 48a7fed5
...@@ -4998,9 +4998,6 @@ mdb_env_open2(MDB_env *env, int prev) ...@@ -4998,9 +4998,6 @@ mdb_env_open2(MDB_env *env, int prev)
#endif #endif
env->me_maxpg = env->me_mapsize / env->me_psize; env->me_maxpg = env->me_mapsize / env->me_psize;
if (env->me_txns)
env->me_txns->mti_txnid = meta.mm_txnid;
#if MDB_DEBUG #if MDB_DEBUG
{ {
MDB_meta *meta = mdb_env_pick_meta(env); MDB_meta *meta = mdb_env_pick_meta(env);
...@@ -5100,6 +5097,9 @@ static int ESECT ...@@ -5100,6 +5097,9 @@ static int ESECT
mdb_env_share_locks(MDB_env *env, int *excl) mdb_env_share_locks(MDB_env *env, int *excl)
{ {
int rc = 0; int rc = 0;
MDB_meta *meta = mdb_env_pick_meta(env);
env->me_txns->mti_txnid = meta->mm_txnid;
#ifdef _WIN32 #ifdef _WIN32
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment