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

diff --git a/libraries/liblmdb/CHANGES b/libraries/liblmdb/CHANGES
index 6129fa461cda93e819101e4f880212aafa185914..07b087aad977ade746a4243881f30aa0026a037b 100644 (file)
--- a/libraries/liblmdb/CHANGES
+++ b/libraries/liblmdb/CHANGES
@@ -3,10 +3,12 @@ LMDB 0.9 Change Log
 LMDB 0.9.17 Release Engineering
        Fix ITS#7377 catch calloc failure
        Fix ITS#8237 regression from ITS#7589
+       Fix ITS#8238 page_split for DUPFIXED pages
        Fix ITS#8221 MDB_PAGE_FULL on delete/rebalance
        Fix ITS#8258 rebalance/split assert
-       Fix ITS#8264 cursor_del cursor tracking
        Fix ITS#8263 cursor_put cursor tracking
+       Fix ITS#8264 cursor_del cursor tracking
+       Fix ITS#8299 mdb_del cursor tracking
        Fix ITS#7771 fakepage cursor tracking
        Fix ITS#7789 ensure mapsize >= pages in use
        Fix ITS#7971 mdb_txn_renew0() new reader slots

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index 8940fdf8be6aa02a95a6b0921bccbb17e6ca7fe6..0bff10e75933687912cb62909bf0f3e6bbac2efd 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -8298,6 +8298,7 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
                                rp->mp_upper -= ksize - sizeof(indx_t);
                                mc->mc_ki[mc->mc_top] = x;
                                mc->mc_pg[mc->mc_top] = rp;
+                               mc->mc_ki[ptop]++;
                        }
                } else {
                        int psize, nsize, k;