projects
/
platform
/
upstream
/
lmdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a103a64
)
Fix mdb_drop return
author
Howard Chu
<hyc@symas.com>
Wed, 9 Nov 2011 00:45:45 +0000
(16:45 -0800)
committer
Howard Chu
<hyc@symas.com>
Wed, 9 Nov 2011 00:45:45 +0000
(16:45 -0800)
libraries/libmdb/mdb.c
patch
|
blob
|
history
diff --git
a/libraries/libmdb/mdb.c
b/libraries/libmdb/mdb.c
index
32f50fe
..
f3adb66
100644
(file)
--- a/
libraries/libmdb/mdb.c
+++ b/
libraries/libmdb/mdb.c
@@
-5910,8
+5910,7
@@
int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del)
rc = mdb_drop0(mc, mc->mc_db->md_flags & MDB_DUPSORT);
if (rc)
- mdb_cursor_close(mc);
- return rc;
+ goto leave;
/* Can't delete the main DB */
if (del && dbi > MAIN_DBI) {
@@
-5927,6
+5926,7
@@
int mdb_drop(MDB_txn *txn, MDB_dbi dbi, int del)
txn->mt_dbs[dbi].md_entries = 0;
txn->mt_dbs[dbi].md_root = P_INVALID;
}
+leave:
mdb_cursor_close(mc);
return rc;
}