DB-832 accomodate the change to the iterate transactions callback

Tokutek · May 20, 2015 · e3d320d · e3d320d
1 parent a586965
commit e3d320d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/mongo/db/storage/env.cpp b/src/mongo/db/storage/env.cpp
@@ -997,15 +997,15 @@ namespace mongo {
                 vector<BSONObj> &_txns;
               public:
                 iterate_transactions(vector<BSONObj> &txns) : _txns(txns) { }
-                static int callback(uint64_t txnid, uint64_t client_id,
+                static int callback(DB_TXN *txn,
                                     iterate_row_locks_callback iterate_locks,
                                     void *locks_extra, void *extra) {
                     iterate_transactions *info = reinterpret_cast<iterate_transactions *>(extra);
                     try {
                         // We ignore client_id because txnid is sufficient for finding
                         // the associated operation in db.currentOp()
                         BSONObjBuilder status;
-                        status.appendNumber("txnid", txnid);
+                        status.appendNumber("txnid", txn->id64(txn));
                         BSONArrayBuilder locks(status.subarrayStart("rowLocks"));
                         {
                             DB *db;