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:
0fdfdf3
)
ITS#8304 fix page_merge
author
Howard Chu
<hyc@openldap.org>
Mon, 9 Nov 2015 20:09:10 +0000
(20:09 +0000)
committer
Howard Chu
<hyc@openldap.org>
Mon, 9 Nov 2015 20:09:10 +0000
(20:09 +0000)
Was using the pre-touch dst page pointer instead of the touched page
libraries/liblmdb/mdb.c
patch
|
blob
|
history
diff --git
a/libraries/liblmdb/mdb.c
b/libraries/liblmdb/mdb.c
index
59222ca
..
6d9e0a4
100644
(file)
--- a/
libraries/liblmdb/mdb.c
+++ b/
libraries/liblmdb/mdb.c
@@
-7854,6
+7854,9
@@
mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
if ((rc = mdb_page_touch(cdst)))
return rc;
+ /* get dst page again now that we've touched it. */
+ pdst = cdst->mc_pg[cdst->mc_top];
+
/* Move all nodes from src to dst.
*/
j = nkeys = NUMKEYS(pdst);