Commit 4c8f5761 authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

Fix commit "Raise safe max MDB_MAXKEYSIZE."

I.e. d69d2ce2, it left out some changes.
parent a2ed0364
......@@ -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,6 +5966,7 @@ prep_subDB:
rdata = &xdata;
flags |= F_DUPDATA;
do_sub = 1;
if (!insert)
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], 0);
goto new_sub;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment