summaryrefslogtreecommitdiff
path: root/src/txn/txn_rec.c
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2015-02-17 17:25:57 +0000
committer <>2015-03-17 16:26:24 +0000
commit780b92ada9afcf1d58085a83a0b9e6bc982203d1 (patch)
tree598f8b9fa431b228d29897e798de4ac0c1d3d970 /src/txn/txn_rec.c
parent7a2660ba9cc2dc03a69ddfcfd95369395cc87444 (diff)
downloadberkeleydb-master.tar.gz
Imported from /home/lorry/working-area/delta_berkeleydb/db-6.1.23.tar.gz.HEADdb-6.1.23master
Diffstat (limited to 'src/txn/txn_rec.c')
-rw-r--r--src/txn/txn_rec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/txn/txn_rec.c b/src/txn/txn_rec.c
index b39d56d1..708af98a 100644
--- a/src/txn/txn_rec.c
+++ b/src/txn/txn_rec.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.
*/
/*
* Copyright (c) 1996
@@ -210,11 +210,12 @@ __txn_prepare_recover(env, dbtp, lsnp, op, info)
*/
else if ((ret = __db_txnlist_remove(env,
info, argp->txnp->txnid)) != 0) {
-txn_err: __db_errx(env,
+txn_err:
+ ret = USR_ERR(env, DB_NOTFOUND);
+ __db_errx(env,
DB_STR_A("4515",
"transaction not in list %lx", "%lx"),
(u_long)argp->txnp->txnid);
- ret = DB_NOTFOUND;
} else if (IS_ZERO_LSN(headp->trunc_lsn) ||
LOG_COMPARE(&headp->trunc_lsn, lsnp) >= 0) {
if ((ret = __db_txnlist_add(env,