From: Howard Chu <hyc@openldap.org>
Date: Wed, 25 Jul 2012 19:32:28 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/mdb.master'
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4317c7ce54ceb41d57e6ec83f547edfaeedb574b;hp=cf74dfbb2d1cc91fa3bd4ed74e5eb01a92c0436f;p=openldap

Merge remote-tracking branch 'origin/mdb.master'
---

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 87d5feec7c..9ce45b30b8 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -4261,9 +4261,11 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
 			rc = mdb_cursor_last(mc, &k2, &d2);
 			if (rc == 0) {
 				rc = mc->mc_dbx->md_cmp(key, &k2);
-				if (rc) {
+				if (rc > 0) {
 					rc = MDB_NOTFOUND;
 					mc->mc_ki[mc->mc_top]++;
+				} else {
+					rc = 0;
 				}
 			}
 		} else {