summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Schultz <william.schultz@mongodb.com>2018-02-21 15:48:16 -0500
committerWilliam Schultz <william.schultz@mongodb.com>2018-02-21 15:48:16 -0500
commit6aa704c31f2489e60aa3d1cd0d5ce1ec014b907a (patch)
tree86da6d05928fb9dde41f5b4552b8bf43cc8f8d8c
parent38004a72fa1f34de2bba3f1711d06c914a4abcb7 (diff)
downloadmongo-6aa704c31f2489e60aa3d1cd0d5ce1ec014b907a.tar.gz
Fix merge conflict in op_observer_impl_test
-rw-r--r--src/mongo/db/op_observer_impl_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/op_observer_impl_test.cpp b/src/mongo/db/op_observer_impl_test.cpp
index 094b5f71430..72917228aaf 100644
--- a/src/mongo/db/op_observer_impl_test.cpp
+++ b/src/mongo/db/op_observer_impl_test.cpp
@@ -268,7 +268,7 @@ public:
NamespaceString nss,
TxnNumber txnNum,
StmtId stmtId) {
- session->beginTxn(opCtx, txnNum);
+ session->beginOrContinueTxn(opCtx, txnNum, boost::none);
{
AutoGetCollection autoColl(opCtx, nss, MODE_IX);