From: Howard Chu Date: Mon, 5 Sep 2011 23:20:31 +0000 (-0700) Subject: More merge fix X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=13ad0aedccb29f11e3238f3319d00d9ac15d5a85;p=openldap More merge fix --- diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c index 7e77026bd2..bf09af860c 100644 --- a/libraries/libmdb/mdb.c +++ b/libraries/libmdb/mdb.c @@ -2577,8 +2577,6 @@ set1: rc = 0; goto set2; } - rc = cursor->mc_txn->mt_dbxs[cursor->mc_dbi].md_cmp(key, &nodekey); - if (rc <= 0) goto set1; } /* If any parents have right-sibs, search. * Otherwise, there's nothing further.