projects
/
platform
/
upstream
/
lmdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a72292
)
Simplify recent changes a bit.
author
Hallvard Furuseth
<hallvard@openldap.org>
Mon, 1 Dec 2014 07:59:29 +0000
(08:59 +0100)
committer
Hallvard Furuseth
<hallvard@openldap.org>
Mon, 1 Dec 2014 07:59:29 +0000
(08:59 +0100)
libraries/liblmdb/mdb.c
patch
|
blob
|
history
diff --git
a/libraries/liblmdb/mdb.c
b/libraries/liblmdb/mdb.c
index
3b82277
..
51d97d6
100644
(file)
--- a/
libraries/liblmdb/mdb.c
+++ b/
libraries/liblmdb/mdb.c
@@
-2820,11
+2820,8
@@
mdb_txn_reset0(MDB_txn *txn, const char *act)
txn->mt_dbxs = NULL; /* mark txn as reset */
} else {
pgno_t *pghead = env->me_pghead;
- env->me_pghead = NULL;
- env->me_pglast = 0;
mdb_cursors_close(txn, 0);
-
if (!(env->me_flags & MDB_WRITEMAP)) {
mdb_dlist_free(txn);
}
@@
-2832,6
+2829,9
@@
mdb_txn_reset0(MDB_txn *txn, const char *act)
if (!txn->mt_parent) {
if (mdb_midl_shrink(&txn->mt_free_pgs))
env->me_free_pgs = txn->mt_free_pgs;
+ /* me_pgstate: */
+ env->me_pghead = NULL;
+ env->me_pglast = 0;
env->me_txn = NULL;
/* The writer mutex was locked in mdb_txn_begin. */