Revert "SERVER-18131 Clean up LastError."

This reverts commit 54c25da33ec7270295c8948f6a51376ec4fd278c and
commit c952a9396a1843aa45d6afa3c6785dec607de112.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/mongo/dbtests/perftests.cpp b/src/mongo/dbtests/perftests.cpp
index 310ae31e3a1..90c0d74c632 100644
--- a/src/mongo/dbtests/perftests.cpp
+++ b/src/mongo/dbtests/perftests.cpp
@@ -49,7 +49,6 @@
 #include <mutex>
 
 #include "mongo/config.h"
-#include "mongo/db/client.h"
 #include "mongo/db/db.h"
 #include "mongo/db/dbdirectclient.h"
 #include "mongo/db/json.h"
@@ -92,10 +91,12 @@ namespace PerfTests {
     class ClientBase {
     public:
         ClientBase() : _client(&_txn) {
-            mongo::LastError::get(_txn.getClient()).reset();
+            _prevError = mongo::lastError._get( false );
+            mongo::lastError.release();
+            mongo::lastError.reset( new LastError() );
         }
         virtual ~ClientBase() {
-            mongo::LastError::get(_txn.getClient()).reset();
+            mongo::lastError.reset( _prevError );
         }
 
     protected:
@@ -113,6 +114,7 @@ namespace PerfTests {
         OperationContext* txn() { return &_txn; }
 
     private:
+        LastError* _prevError;
         OperationContextImpl _txn;
         DBDirectClient _client;
     };