1 files changed, 18 insertions, 20 deletions

diff --git a/src/mongo/dbtests/query_stage_merge_sort.cpp b/src/mongo/dbtests/query_stage_merge_sort.cpp
index 43319528bb2..6ddf69290e5 100644
--- a/src/mongo/dbtests/query_stage_merge_sort.cpp
+++ b/src/mongo/dbtests/query_stage_merge_sort.cpp
@@ -50,7 +50,7 @@ namespace QueryStageMergeSortTests {
         QueryStageMergeSortTestBase() { }
 
         virtual ~QueryStageMergeSortTestBase() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             _client.dropCollection(ns());
         }
 
@@ -95,25 +95,23 @@ namespace QueryStageMergeSortTests {
         }
 
         static const char* ns() { return "unittests.QueryStageMergeSort"; }
-
-    protected:
-        OperationContextImpl _txn;
-
     private:
-        DBDirectClient _client;
+        static DBDirectClient _client;
     };
 
+    DBDirectClient QueryStageMergeSortTestBase::_client;
+
     // SERVER-1205:
     // find($or[{a:1}, {b:1}]).sort({c:1}) with indices {a:1, c:1} and {b:1, c:1}.
     class QueryStageMergeSortPrefixIndex : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             const int N = 50;
@@ -172,12 +170,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortDups : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             const int N = 50;
@@ -235,12 +233,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortDupsNoDedup : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             const int N = 50;
@@ -299,12 +297,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortPrefixIndexReverse : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             const int N = 50;
@@ -364,12 +362,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortOneStageEOF : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             const int N = 50;
@@ -427,12 +425,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortManyShort : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             WorkingSet* ws = new WorkingSet();
@@ -480,12 +478,12 @@ namespace QueryStageMergeSortTests {
     class QueryStageMergeSortInvalidation : public QueryStageMergeSortTestBase {
     public:
         void run() {
-            Client::WriteContext ctx(&_txn, ns());
+            Client::WriteContext ctx(ns());
             OperationContextImpl txn;
             Database* db = ctx.ctx().db();
             Collection* coll = db->getCollection(ns());
             if (!coll) {
-                coll = db->createCollection(&_txn, ns());
+                coll = db->createCollection(&txn, ns());
             }
 
             WorkingSet ws;