upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-28 01:29:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update sub-DBs before updating free list

Browse source
This commit is contained in:
Howard Chu 2012-07-26 06:25:31 -07:00
parent d3990eb2f8
commit d1a7fa267b
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/libmdb/mdb.c
View file

@ -1877,6 +1877,23 @@ mdb_txn_commit(MDB_txn *txn)
DPRINTF("committing txn %zu %p on mdbenv %p, root page %zu",
txn->mt_txnid, (void *)txn, (void *)env, txn->mt_dbs[MAIN_DBI].md_root);
/* Update DB root pointers. Their pages have already been
* touched so this is all in-place and cannot fail.
*/
{
MDB_dbi i;
MDB_val data;
data.mv_size = sizeof(MDB_db);
mdb_cursor_init(&mc, txn, MAIN_DBI, NULL);
for (i = 2; i < txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_DIRTY) {
data.mv_data = &txn->mt_dbs[i];
mdb_cursor_put(&mc, &txn->mt_dbxs[i].md_name, &data, 0);
}
}
}
mdb_cursor_init(&mc, txn, FREE_DBI, NULL);
/* should only be one record now */
@ -1997,22 +2014,6 @@ again:
env->me_free_pgs = txn->mt_free_pgs;
}
/* Update DB root pointers. Their pages have already been
* touched so this is all in-place and cannot fail.
*/
{
MDB_dbi i;
MDB_val data;
data.mv_size = sizeof(MDB_db);
mdb_cursor_init(&mc, txn, MAIN_DBI, NULL);
for (i = 2; i < txn->mt_numdbs; i++) {
if (txn->mt_dbflags[i] & DB_DIRTY) {
data.mv_data = &txn->mt_dbs[i];
mdb_cursor_put(&mc, &txn->mt_dbxs[i].md_name, &data, 0);
}
}
}
#if MDB_DEBUG > 2
mdb_audit(txn);
#endif