]> git.sur5r.net Git - openldap/commitdiff
More txn/cursor cleanup
authorHoward Chu <hyc@symas.com>
Fri, 19 Aug 2011 02:22:24 +0000 (19:22 -0700)
committerHoward Chu <hyc@symas.com>
Thu, 1 Sep 2011 23:31:10 +0000 (16:31 -0700)
libraries/libmdb/mdb.c

index 70eac01bf06a035b0fcdf1ca17534d56c50154f9..135c10359f41162e1b9a319adfd26cadb37d49b7 100644 (file)
@@ -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);
                }