Merge hotfix into master.

Author: bgrainger

docs/content/overview/version-history.md

@@ -1,5 +1,5 @@
 ---
-lastmod: 2022-01-24
+lastmod: 2022-01-25
 date: 2017-03-27
 menu:
   main:
@@ -10,6 +10,11 @@ weight: 30
 
 # Version History
 
+### 2.1.4
+
+* Fix `InvalidOperationException` if `MySqlDataReader.RecordsAffected` was read after calling `Close()` or `Dispose()`: [#1122](https://github.com/mysql-net/MySqlConnector/issues/1122).
+  * This was a regression introduced by [#1096](https://github.com/mysql-net/MySqlConnector/issues/1096) in 2.1.3.
+
 ### 2.1.3
 
 * Fix `Use Compression = True` when running under .NET 6.0: [#1120](https://github.com/mysql-net/MySqlConnector/issues/1120).

src/MySqlConnector/Core/ResultSet.cs

@@ -49,7 +49,7 @@ public async Task ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 					// if we've read a result set header then this is a SELECT statement, so we shouldn't overwrite RecordsAffected
 					// (which should be -1 for SELECT) unless the server reports a non-zero count
 					if (State != ResultSetState.ReadResultSetHeader || ok.AffectedRowCount != 0)
-						RecordsAffected = (RecordsAffected ?? 0) + ok.AffectedRowCount;
+						DataReader.RealRecordsAffected = (DataReader.RealRecordsAffected ?? 0) + ok.AffectedRowCount;
 
 					if (ok.LastInsertId != 0)
 						Command?.SetLastInsertedId((long) ok.LastInsertId);
@@ -365,7 +365,6 @@ public Row GetCurrentRow()
 	public ResultSetState BufferState { get; private set; }
 	public ColumnDefinitionPayload[]? ColumnDefinitions { get; private set; }
 	public MySqlDbType[]? ColumnTypes { get; private set; }
-	public ulong? RecordsAffected { get; private set; }
 	public int WarningCount { get; private set; }
 	public ResultSetState State { get; private set; }
 	public bool ContainsCommandParameters { get; private set; }

src/MySqlConnector/MySqlDataReader.cs

@@ -202,7 +202,7 @@ public override bool HasRows
 	}
 
 	public override bool IsClosed => Command is null;
-	public override int RecordsAffected => GetResultSet().RecordsAffected is ulong recordsAffected ? checked((int) recordsAffected) : -1;
+	public override int RecordsAffected => RealRecordsAffected is ulong recordsAffected ? checked((int) recordsAffected) : -1;
 
 	public override int GetOrdinal(string name) => GetResultSet().GetOrdinal(name);
 
@@ -442,6 +442,7 @@ protected override void Dispose(bool disposing)
 	internal Activity? Activity { get; }
 	internal IMySqlCommand? Command { get; private set; }
 	internal MySqlConnection? Connection => Command?.Connection;
+	internal ulong? RealRecordsAffected { get; set; }
 	internal ServerSession? Session => Command?.Connection!.Session;
 
 	internal static async Task<MySqlDataReader> CreateAsync(CommandListPosition commandListPosition, ICommandPayloadCreator payloadCreator, IDictionary<string, CachedProcedure?>? cachedProcedures, IMySqlCommand command, CommandBehavior behavior, Activity? activity, IOBehavior ioBehavior, CancellationToken cancellationToken)

tests/SideBySide/UpdateTests.cs

@@ -14,11 +14,8 @@ public void Dispose()
 	}
 
 	[Theory]
-	[InlineData(1, 2)]
-	[InlineData(2, 1)]
-	[InlineData(3, 0)]
-	[InlineData(4, 1)]
-	public async Task UpdateRowsExecuteReader(int oldValue, int expectedRowsUpdated)
+	[MemberData(nameof(GetUpdateRowsExecuteReaderData))]
+	public async Task UpdateRowsExecuteReader(int oldValue, int expectedRowsUpdated, int closeDispose)
 	{
 		using (var cmd = m_database.Connection.CreateCommand())
 		{
@@ -43,11 +40,22 @@ public async Task UpdateRowsExecuteReader(int oldValue, int expectedRowsUpdated)
 
 			using var reader = await cmd.ExecuteReaderAsync().ConfigureAwait(false);
 			Assert.False(await reader.ReadAsync().ConfigureAwait(false));
+
+			if (closeDispose == 1)
+				reader.Close();
+			else if (closeDispose == 2)
+				reader.Dispose();
 			Assert.Equal(expectedRowsUpdated, reader.RecordsAffected);
-			Assert.False(await reader.NextResultAsync().ConfigureAwait(false));
+
+			if (closeDispose == 0)
+				Assert.False(await reader.NextResultAsync().ConfigureAwait(false));
 		}
 	}
 
+	public static IEnumerable<object[]> GetUpdateRowsExecuteReaderData() =>
+		new[] { new KeyValuePair<int, int>(1, 2), new KeyValuePair<int, int>(2, 1), new KeyValuePair<int, int>(3, 0), new KeyValuePair<int, int>(4, 1) }
+			.SelectMany(x => new[] { 0, 1, 2 }.Select(y => new object[] { x.Key, x.Value, y }));
+
 	[Theory]
 	[InlineData(1, 2)]
 	[InlineData(2, 1)]