diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-03-23 14:36:49 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-03-23 04:04:35 +0000 |
| commit | 97293a6e2a0b744cd64cc02674b6d9f8b7504d78 (patch) | |
| tree | 745eb22fc5c19ed73c36434276a56aaef8e89d09 /src/third_party/wiredtiger/src/session/session_api.c | |
| parent | aa89aa4324ddf219053e7af337ca70d440e7cc3a (diff) | |
| download | mongo-97293a6e2a0b744cd64cc02674b6d9f8b7504d78.tar.gz | |
Import wiredtiger: 727c47960ad2e52f9a8c0215ff9d9dd569ef44a1 from branch mongodb-master
ref: d641b5a3c0..727c47960a
for: 6.0.0
WT-8935 Failed transaction commit doesn't reset cursors.
Diffstat (limited to 'src/third_party/wiredtiger/src/session/session_api.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/session/session_api.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/src/session/session_api.c b/src/third_party/wiredtiger/src/session/session_api.c index 1957a42beda..fc1127db390 100644 --- a/src/third_party/wiredtiger/src/session/session_api.c +++ b/src/third_party/wiredtiger/src/session/session_api.c @@ -1673,14 +1673,10 @@ __session_commit_transaction(WT_SESSION *wt_session, const char *config) WT_ERR(__wt_txn_context_check(session, true)); /* Permit the commit if the transaction failed, but was read-only. */ - if (F_ISSET(txn, WT_TXN_ERROR) && txn->mod_count != 0) { - __wt_err(session, EINVAL, - "failed %s" - "transaction requires rollback%s%s", + if (F_ISSET(txn, WT_TXN_ERROR) && txn->mod_count != 0) + WT_ERR_MSG(session, EINVAL, "failed %s transaction requires rollback%s%s", F_ISSET(txn, WT_TXN_PREPARE) ? "prepared " : "", txn->rollback_reason == NULL ? "" : ": ", txn->rollback_reason == NULL ? "" : txn->rollback_reason); - ret = EINVAL; - } err: /* |