* Require Berkeley DB 4.4.
* Checkpoint after an upgrade.
This commit is contained in:
parent
dc528128cc
commit
760264bffe
2 changed files with 6 additions and 4 deletions
6
externals/Makefile.am
vendored
6
externals/Makefile.am
vendored
|
@ -1,11 +1,11 @@
|
||||||
# Berkeley DB
|
# Berkeley DB
|
||||||
|
|
||||||
DB = db-4.3.28.NC
|
DB = db-4.4.16.NC
|
||||||
|
|
||||||
$(DB).tar.gz:
|
$(DB).tar.gz:
|
||||||
@echo "Nix requires Berkeley DB to build."
|
@echo "Nix requires Berkeley DB to build."
|
||||||
@echo "Please download version 4.3.28 from"
|
@echo "Please download version 4.4.16 from"
|
||||||
@echo " http://downloads.sleepycat.com/db-4.3.28.NC.tar.gz"
|
@echo " http://downloads.sleepycat.com/db-4.4.16.NC.tar.gz"
|
||||||
@echo "and place it in the externals/ directory."
|
@echo "and place it in the externals/ directory."
|
||||||
false
|
false
|
||||||
|
|
||||||
|
|
|
@ -306,11 +306,13 @@ void Database::open(const string & path)
|
||||||
|
|
||||||
/* Try again. */
|
/* Try again. */
|
||||||
open2(path, false);
|
open2(path, false);
|
||||||
|
|
||||||
|
/* Force a checkpoint, as per the BDB docs. */
|
||||||
|
env->txn_checkpoint(DB_FORCE, 0, 0);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
rethrow(e);
|
rethrow(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue