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

This commit is contained in:
Howard Chu 2012-12-06 17:41:14 -08:00
commit 6062cd9777

View File

@ -1338,7 +1338,7 @@ none:
MDB_oldpages *mop = txn->mt_env->me_pghead; MDB_oldpages *mop = txn->mt_env->me_pghead;
if (num > 1) { if (num > 1) {
MDB_cursor m2; MDB_cursor m2;
int retry = 20, readit = 0, n2 = num-1; int retry = 60, readit = 0, n2 = num-1;
unsigned int i, j, k; unsigned int i, j, k;
/* If current list is too short, must fetch more and coalesce */ /* If current list is too short, must fetch more and coalesce */