Send retained transaction descriptor in MARS TDS header for .NET Core and .NET 5+ (#1623) (#1624)

swh-cb · web-flow · commit e1fcf5bf029b · 2022-05-26T17:41:42.000-07:00
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParser.cs
@@ -10753,7 +10753,8 @@ private void WriteMarsHeaderData(TdsParserStateObject stateObj, SqlInternalTrans
             }
             else
             {
-                WriteLong(SqlInternalTransaction.NullTransactionId, stateObj);
+                // If no transaction, send over retained transaction descriptor (empty if none retained)
+                WriteLong(_retainedTransactionId, stateObj);
                 WriteInt(stateObj.IncrementAndObtainOpenResultCount(null), stateObj);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -10753,7 +10753,8 @@ private void WriteMarsHeaderData(TdsParserStateObject stateObj, SqlInternalTrans`
`10753`	`10753`	`}`
`10754`	`10754`	`else`
`10755`	`10755`	`{`
`10756`		`- WriteLong(SqlInternalTransaction.NullTransactionId, stateObj);`
	`10756`	`+ // If no transaction, send over retained transaction descriptor (empty if none retained)`
	`10757`	`+ WriteLong(_retainedTransactionId, stateObj);`
`10757`	`10758`	`WriteInt(stateObj.IncrementAndObtainOpenResultCount(null), stateObj);`
`10758`	`10759`	`}`
`10759`	`10760`	`}`