upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-02 04:59:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix commit "Raise safe max MDB_MAXKEYSIZE."

Browse source 
I.e. d69d2ce230, it left out some changes.
This commit is contained in:
Hallvard Furuseth 2013-12-21 12:31:57 +01:00
parent a2ed03642c
commit 4c8f57615c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/liblmdb/mdb.c
View file

@ -4507,8 +4507,6 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
}
#endif
assert(nkeys > 0);
low = IS_LEAF(mp) ? 0 : 1;
high = nkeys - 1;
cmp = mc->mc_dbx->md_cmp;
@ -4571,7 +4569,7 @@ mdb_node_search(MDB_cursor *mc, MDB_val *key, int *exactp)
node = NODEPTR(mp, i);
}
if (exactp)
*exactp = (rc == 0);
*exactp = (rc == 0 && nkeys > 0);
/* store the key index */
mc->mc_ki[mc->mc_top] = i;
if (i >= nkeys)
@ -5968,7 +5966,8 @@ prep_subDB:
rdata = &xdata;
flags |= F_DUPDATA;
do_sub = 1;
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
if (!insert)
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
goto new_sub;
}
current: