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

Factor out parent

Browse Source
This commit is contained in:
Howard Chu 2013-07-11 22:09:46 +02:00
parent ba6dfe0bbb
commit 87a7f06feb
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/liblmdb/mdb.c
View File

@ -2348,16 +2348,16 @@ mdb_txn_commit(MDB_txn *txn)
/* Update parent's DB table. */
memcpy(parent->mt_dbs, txn->mt_dbs, txn->mt_numdbs * sizeof(MDB_db));
txn->mt_parent->mt_numdbs = txn->mt_numdbs;
txn->mt_parent->mt_dbflags[0] = txn->mt_dbflags[0];
txn->mt_parent->mt_dbflags[1] = txn->mt_dbflags[1];
parent->mt_numdbs = txn->mt_numdbs;
parent->mt_dbflags[0] = txn->mt_dbflags[0];
parent->mt_dbflags[1] = txn->mt_dbflags[1];
for (i=2; i<txn->mt_numdbs; i++) {
/* preserve parent's DB_NEW status */
x = txn->mt_parent->mt_dbflags[i] & DB_NEW;
txn->mt_parent->mt_dbflags[i] = txn->mt_dbflags[i] | x;
x = parent->mt_dbflags[i] & DB_NEW;
parent->mt_dbflags[i] = txn->mt_dbflags[i] | x;
}
dst = txn->mt_parent->mt_u.dirty_list;
dst = parent->mt_u.dirty_list;
src = txn->mt_u.dirty_list;
/* Find len = length of merging our dirty list with parent's */
x = dst[0].mid;
@ -2391,7 +2391,7 @@ mdb_txn_commit(MDB_txn *txn)
free(txn->mt_u.dirty_list);
parent->mt_dirty_room = txn->mt_dirty_room;
txn->mt_parent->mt_child = NULL;
parent->mt_child = NULL;
mdb_midl_free(((MDB_ntxn *)txn)->mnt_pgstate.mf_pghead);
free(txn);
return MDB_SUCCESS;