From: Howard Chu <hyc@openldap.org>
Date: Sun, 3 May 2015 06:43:11 +0000 (+0100)
Subject: Revert "ITS#8117 cleanup prev commit"
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=3d2202f31c14c6188093a492a97371069a732557;p=openldap

Revert "ITS#8117 cleanup prev commit"

This reverts commit ce7ba0ceb69fd2cd56d557c1a877d046ec9f246c.

Revert "ITS#8117 fix INTEGERDUP compare"

This reverts commit ed13d4aa59cf06a1bb6b096fe19af63fc6f8737a.
---

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index f6c293c6bb..f1c7508ccf 100644
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -7194,15 +7194,13 @@ mdb_xcursor_init1(MDB_cursor *mc, MDB_node *node)
 				mx->mx_db.md_flags |= MDB_INTEGERKEY;
 		}
 	}
-#if UINT_MAX < SIZE_MAX
-	if (mc->mc_dbx->md_dcmp == mdb_cmp_int && mx->mx_db.md_pad == sizeof(size_t)) {
-		mc->mc_dbx->md_dcmp = mdb_cmp_clong;
-		mx->mx_dbx.md_cmp = mdb_cmp_clong;
-	}
-#endif
 	DPRINTF(("Sub-db -%u root page %"Z"u", mx->mx_cursor.mc_dbi,
 		mx->mx_db.md_root));
 	mx->mx_dbflag = DB_VALID|DB_DIRTY; /* DB_DIRTY guides mdb_cursor_touch */
+#if UINT_MAX < SIZE_MAX
+	if (mx->mx_dbx.md_cmp == mdb_cmp_int && mx->mx_db.md_pad == sizeof(size_t))
+		mx->mx_dbx.md_cmp = mdb_cmp_clong;
+#endif
 }
 
 /** Initialize a cursor for a given transaction and database. */