forked from pool/openldap2
26 lines
1.0 KiB
Diff
26 lines
1.0 KiB
Diff
From fd7bfbc0df0ade534bea84914d385ecf2a73f678 Mon Sep 17 00:00:00 2001
|
|
From: Howard Chu <hyc@openldap.org>
|
|
Date: Tue, 8 Dec 2015 18:17:24 +0000
|
|
Subject: ITS#8336 fix page_search_root assert on FreeDB
|
|
|
|
Let "illegal" branch pages thru on the FreeDB - the condition
|
|
is only temporary and will be fixed by the time rebalance finishes.
|
|
|
|
diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
|
|
index fa0c9e5..a624cba 100644
|
|
--- a/libraries/liblmdb/mdb.c
|
|
+++ b/libraries/liblmdb/mdb.c
|
|
@@ -5279,7 +5279,11 @@ mdb_page_search_root(MDB_cursor *mc, MDB_val *key, int flags)
|
|
indx_t i;
|
|
|
|
DPRINTF(("branch page %"Z"u has %u keys", mp->mp_pgno, NUMKEYS(mp)));
|
|
- mdb_cassert(mc, NUMKEYS(mp) > 1);
|
|
+ /* Don't assert on branch pages in the FreeDB. We can get here
|
|
+ * while in the process of rebalancing a FreeDB branch page; we must
|
|
+ * let that proceed. ITS#8336
|
|
+ */
|
|
+ mdb_cassert(mc, !mc->mc_dbi || NUMKEYS(mp) > 1);
|
|
DPRINTF(("found index 0 to page %"Z"u", NODEPGNO(NODEPTR(mp, 0))));
|
|
|
|
if (flags & (MDB_PS_FIRST|MDB_PS_LAST)) {
|