Fix commit "Raise safe max MDB_MAXKEYSIZE."

I.e. d69d2ce230, it left out some changes.
vmware
Hallvard Furuseth 11 years ago
parent a2ed03642c
commit 4c8f57615c
  1. 5
      libraries/liblmdb/mdb.c

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

Loading…
Cancel
Save