From 3d2202f31c14c6188093a492a97371069a732557 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sun, 3 May 2015 07:43:11 +0100 Subject: [PATCH] Revert "ITS#8117 cleanup prev commit" This reverts commit ce7ba0ceb69fd2cd56d557c1a877d046ec9f246c. Revert "ITS#8117 fix INTEGERDUP compare" This reverts commit ed13d4aa59cf06a1bb6b096fe19af63fc6f8737a. --- libraries/liblmdb/mdb.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c index f6c293c..f1c7508 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. */