From: Howard Chu <hyc@symas.com>
Date: Fri, 19 Aug 2011 02:22:24 +0000 (-0700)
Subject: More txn/cursor cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_4_27~148^2~95
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=697e00a8e2133794acac51d9e52f56459983d404;p=openldap

More txn/cursor cleanup
---

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 70eac01bf0..135c10359f 100644
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -975,9 +975,6 @@ done:
 
 	pthread_mutex_unlock(&env->me_txns->mti_wmutex);
 	free(txn);
-	txn = NULL;
-
-	mdb_txn_abort(txn);
 
 	return MDB_SUCCESS;
 }
@@ -2481,7 +2478,6 @@ mdb_cursor_close(MDB_cursor *cursor)
 		while(!CURSOR_EMPTY(cursor))
 			cursor_pop_page(cursor);
 		if (cursor->mc_txn->mt_dbs[cursor->mc_dbi].md_flags & MDB_DUPSORT) {
-			mdb_xcursor_fini(cursor->mc_txn, cursor->mc_dbi, cursor->mc_xcursor);
 			while(!CURSOR_EMPTY(&cursor->mc_xcursor->mx_cursor))
 				cursor_pop_page(&cursor->mc_xcursor->mx_cursor);
 		}