mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Factor out MDB_TXN_ERROR

Browse Source
This commit is contained in:
Hallvard Furuseth 2014-05-30 09:06:08 +02:00
parent ba8f59edf4
commit b37b2a651f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/liblmdb/mdb.c
View File

@ -6190,9 +6190,7 @@ new_sub:
} }
} }
if (rc != MDB_SUCCESS) if (rc == MDB_SUCCESS) {
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
else {
/* Now store the actual data in the child DB. Note that we're /* Now store the actual data in the child DB. Note that we're
* storing the user data in the keys field, so there are strict * storing the user data in the keys field, so there are strict
* size limits on dupdata. The actual data fields of the child * size limits on dupdata. The actual data fields of the child
@ -6215,10 +6213,8 @@ put_sub:
/* converted, write the original data first */ /* converted, write the original data first */
if (dkey.mv_size) { if (dkey.mv_size) {
rc = mdb_cursor_put(&mc->mc_xcursor->mx_cursor, &dkey, &xdata, xflags); rc = mdb_cursor_put(&mc->mc_xcursor->mx_cursor, &dkey, &xdata, xflags);
if (rc) { if (rc)
mc->mc_txn->mt_flags |= MDB_TXN_ERROR; goto bad_sub;
return rc == MDB_KEYEXIST ? MDB_CORRUPTED : rc;
}
{ {
/* Adjust other cursors pointing to mp */ /* Adjust other cursors pointing to mp */
MDB_cursor *m2; MDB_cursor *m2;
@ -6268,7 +6264,12 @@ next_sub:
} }
} }
} }
return rc;
bad_sub:
if (rc == MDB_KEYEXIST) /* should not happen, we deleted that item */
rc = MDB_CORRUPTED;
} }
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
return rc; return rc;
} }