From: Howard Chu <hyc@openldap.org>
Date: Mon, 29 Aug 2011 11:24:21 +0000 (-0700)
Subject: Avoid extraneous txn_renew
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c47136a1f40fdaad1172e6b3c445c6db799bb640;p=thirdparty%2Fopenldap.git

Avoid extraneous txn_renew
---

diff --git a/servers/slapd/back-mdb/id2entry.c b/servers/slapd/back-mdb/id2entry.c
index 04e528846d..57f1fc1add 100644
--- a/servers/slapd/back-mdb/id2entry.c
+++ b/servers/slapd/back-mdb/id2entry.c
@@ -315,7 +315,7 @@ mdb_reader_flush( MDB_env *env )
 int
 mdb_opinfo_get( Operation *op, struct mdb_info *mdb, int rdonly, mdb_op_info **moip )
 {
-	int rc;
+	int rc, renew = 0;
 	void *data;
 	void *ctx;
 	mdb_op_info *moi = NULL;
@@ -407,11 +407,14 @@ mdb_opinfo_get( Operation *op, struct mdb_info *mdb, int rdonly, mdb_op_info **m
 			}
 		} else {
 			moi->moi_txn = data;
+			renew = 1;
 		}
 		moi->moi_flag |= MOI_READER;
 	}
 	if ( moi->moi_ref < 1 ) {
 		moi->moi_ref = 0;
+	}
+	if ( renew ) {
 		mdb_txn_renew( moi->moi_txn );
 	}
 	moi->moi_ref++;
diff --git a/servers/slapd/back-mdb/libmdb b/servers/slapd/back-mdb/libmdb
index ee5bdc1105..d182ccef04 160000
--- a/servers/slapd/back-mdb/libmdb
+++ b/servers/slapd/back-mdb/libmdb
@@ -1 +1 @@
-Subproject commit ee5bdc1105ffd3bbc3344ccea825f4d96be75c17
+Subproject commit d182ccef046d83adb615e92c2d0b16478809f378