Merge remote-tracking branch 'origin/mdb.RE/0.9'

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index c2e5ff672e3f6347a8c36d41d4da47aeac4150d2..1a316123ec80d7122eab568ef8d7af7ce5b71f4c 100644 (file)
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -1,6 +1,9 @@
 LMDB 0.9 Change Log
 
-LMDB 0.9.20 Release Engineering
+LMDB 0.9.21 Release (2017/06/01)
+       Fix xcursor after cursor_del (ITS#8622)
+
+LMDB 0.9.20 (Withdrawn)
        Fix mdb_load with escaped plaintext (ITS#8558)
        Fix mdb_cursor_last / mdb_put interaction (ITS#8557)
 

diff --git a/libraries/liblmdb/lmdb.h b/libraries/liblmdb/lmdb.h
index c444d91606110fbef9113431458a02560b60742f..29135b7f062182dc3c03e68dab281cd7705ccdb0 100644 (file)
--- a/libraries/liblmdb/lmdb.h
+++ b/libraries/liblmdb/lmdb.h
@@ -200,7 +200,7 @@ typedef int mdb_filehandle_t;
 /** Library minor version */
 #define MDB_VERSION_MINOR      9
 /** Library patch version */
-#define MDB_VERSION_PATCH      20
+#define MDB_VERSION_PATCH      21
 
 /** Combine args a,b,c into a single integer for easy version comparisons */
 #define MDB_VERINT(a,b,c)      (((a) << 24) | ((b) << 16) | (c))
@@ -210,7 +210,7 @@ typedef int mdb_filehandle_t;
        MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
 
 /** The release date of this library version */
-#define MDB_VERSION_DATE       "January 11, 2017"
+#define MDB_VERSION_DATE       "June 1, 2017"
 
 /** A stringifier for the version info */
 #define MDB_VERSTR(a,b,c,d)    "LMDB " #a "." #b "." #c ": (" d ")"

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 3f43e94b66452e4f84923aeb6a566a71159a4863..90ac99f2d849c9cd63bdf4152e977065dfb1374c 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8451,14 +8451,17 @@ mdb_cursor_del0(MDB_cursor *mc)
                                        }
                                        if (mc->mc_db->md_flags & MDB_DUPSORT) {
                                                MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]);
-                                               /* If this node is a fake page, it needs to be reinited
-                                                * because its data has moved. But just reset mc_pg[0]
-                                                * if the xcursor is already live.
+                                               /* If this node has dupdata, it may need to be reinited
+                                                * because its data has moved.
+                                                * If the xcursor was not initd it must be reinited.
+                                                * Else if node points to a subDB, nothing is needed.
+                                                * Else (xcursor was initd, not a subDB) needs mc_pg[0] reset.
                                                 */
-                                               if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) {
-                                                       if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)
-                                                               m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
-                                                       else
+                                               if (node->mn_flags & F_DUPDATA) {
+                                                       if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) {
+                                                               if (!(node->mn_flags & F_SUBDATA))
+                                                                       m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
+                                                       } else
                                                                mdb_xcursor_init1(m3, node);
                                                }
                                        }