Front-ported fix for CORE-1140.

FirebirdSQL · Mar 9, 2007 · 57c02cc · 57c02cc
1 parent 06edb5a
commit 57c02cc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/jrd/exe.cpp b/src/jrd/exe.cpp
@@ -1750,6 +1750,7 @@ static jrd_nod* looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node)
 
 	jrd_req* old_request = tdbb->tdbb_request;
 	tdbb->tdbb_request = request;
+	jrd_tra* old_transaction = tdbb->tdbb_transaction;
 	tdbb->tdbb_transaction = transaction;
     fb_assert(request->req_caller == NULL);
 	request->req_caller = old_request;
@@ -2726,8 +2727,8 @@ static jrd_nod* looper(thread_db* tdbb, jrd_req* request, jrd_nod* in_node)
 	}
 
 	request->req_next = node;
-	tdbb->tdbb_transaction = (tdbb->tdbb_request = old_request) ?
-		old_request->req_transaction : NULL;
+	tdbb->tdbb_transaction = old_transaction;
+	tdbb->tdbb_request = old_request;
 	fb_assert(request->req_caller == old_request);
 	request->req_caller = NULL;
 

diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -5063,6 +5063,7 @@ static ISC_STATUS commit(
 		next = transaction->tra_sibling;
 		check_database(tdbb, transaction->tra_attachment, user_status);
 		tdbb->tdbb_status_vector = ptr;
+		tdbb->tdbb_transaction = transaction;
 		TRA_commit(tdbb, transaction, retaining_flag);
 		Database* dbb = tdbb->tdbb_database;
 		--dbb->dbb_use_count;
@@ -6269,7 +6270,7 @@ static bool rollback(thread_db*	tdbb,
 			}
 
 			tdbb->tdbb_status_vector = status_vector;
-
+			tdbb->tdbb_transaction = transaction;
 			TRA_rollback(tdbb, transaction, retaining_flag, false);
 			Database* dbb = tdbb->tdbb_database;
 			--dbb->dbb_use_count;