upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 17:49:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/mdb.master'

Browse source
This commit is contained in:
Howard Chu 2012-12-10 17:22:26 -08:00
commit 470b126e9f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/liblmdb/mdb.c
View file

@ -2127,7 +2127,7 @@ mdb_txn_commit(MDB_txn *txn)
if (env->me_pghead) {
/* make sure first page of freeDB is touched and on freelist */
rc = mdb_page_search(&mc, NULL, MDB_PS_MODIFY);
if (rc) {
if (rc && rc != MDB_NOTFOUND) {
fail:
mdb_txn_abort(txn);
return rc;
@ -2163,7 +2163,7 @@ free2:
key.mv_size = MAXKEYSIZE+1;
key.mv_data = NULL;
rc = mdb_page_search(&mc, &key, MDB_PS_MODIFY);
if (rc)
if (rc && rc != MDB_NOTFOUND)
goto fail;
#if MDB_DEBUG > 1