summaryrefslogtreecommitdiff
path: root/util/db_upgrade.c
diff options
context:
space:
mode:
Diffstat (limited to 'util/db_upgrade.c')
-rw-r--r--util/db_upgrade.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/db_upgrade.c b/util/db_upgrade.c
index 8200322b..72ca0050 100644
--- a/util/db_upgrade.c
+++ b/util/db_upgrade.c
@@ -1,7 +1,7 @@
/*-
* See the file LICENSE for redistribution information.
*
- * Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.
*
* $Id$
*/
@@ -12,7 +12,7 @@
#ifndef lint
static const char copyright[] =
- "Copyright (c) 1996, 2012 Oracle and/or its affiliates. All rights reserved.\n";
+ "Copyright (c) 1996, 2015 Oracle and/or its affiliates. All rights reserved.\n";
#endif
int main __P((int, char *[]));
@@ -127,7 +127,7 @@ main(argc, argv)
* private one and try again.
*/
if ((ret = dbenv->open(dbenv, home, DB_USE_ENVIRON, 0)) != 0 &&
- (ret == DB_VERSION_MISMATCH ||
+ (ret == DB_VERSION_MISMATCH || ret == DB_REP_LOCKOUT ||
(ret = dbenv->open(dbenv, home,
DB_CREATE | DB_INIT_MPOOL | DB_PRIVATE | DB_USE_ENVIRON,
0)) != 0)) {