Remove CancellationToken from methods that don't use it.

These methods are canceled out-of-band by issuing a "KILL QUERY" command to the server that cancels the current query gracefully (rather than closing an open Socket).

Author: bgrainger

src/MySqlConnector/MySqlClient/CommandExecutors/TextCommandExecutor.cs

@@ -65,7 +65,7 @@ public virtual async Task<DbDataReader> ExecuteReaderAsync(string commandText, M
 				try
 				{
 					await m_command.Connection.Session.SendAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
-					return await MySqlDataReader.CreateAsync(m_command, behavior, ioBehavior, CancellationToken.None).ConfigureAwait(false);
+					return await MySqlDataReader.CreateAsync(m_command, behavior, ioBehavior).ConfigureAwait(false);
 				}
 				catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted && cancellationToken.IsCancellationRequested)
 				{

src/MySqlConnector/MySqlClient/MySqlDataReader.cs

@@ -112,7 +112,7 @@ private async Task<ResultSet> ScanResultSetAsyncAwaited(IOBehavior ioBehavior, R
 			{
 				try
 				{
-					m_resultSetBuffered = await resultSet.ReadResultSetHeaderAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);
+					m_resultSetBuffered = await resultSet.ReadResultSetHeaderAsync(ioBehavior).ConfigureAwait(false);
 					return m_resultSetBuffered;
 				}
 				catch (MySqlException ex) when (ex.Number == (int) MySqlErrorCode.QueryInterrupted)
@@ -224,17 +224,17 @@ protected override void Dispose(bool disposing)
 		internal MySqlConnection Connection => Command?.Connection;
 		internal MySqlSession Session => Command?.Connection.Session;
 
-		internal static async Task<MySqlDataReader> CreateAsync(MySqlCommand command, CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken)
+		internal static async Task<MySqlDataReader> CreateAsync(MySqlCommand command, CommandBehavior behavior, IOBehavior ioBehavior)
 		{
 			var dataReader = new MySqlDataReader(command, behavior);
 			command.Connection.Session.SetActiveReader(dataReader);
 
 			try
 			{
-				await dataReader.ReadFirstResultSetAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+				await dataReader.ReadFirstResultSetAsync(ioBehavior).ConfigureAwait(false);
 				if (command.Connection.BufferResultSets)
 				{
-					while (await dataReader.BufferNextResultAsync(ioBehavior, cancellationToken).ConfigureAwait(false) != null)
+					while (await dataReader.BufferNextResultAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false) != null)
 					{
 					}
 				}
@@ -252,9 +252,9 @@ internal static async Task<MySqlDataReader> CreateAsync(MySqlCommand command, Co
 			}
 		}
 
-		internal async Task ReadFirstResultSetAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		internal async Task ReadFirstResultSetAsync(IOBehavior ioBehavior)
 		{
-			m_resultSet = await new ResultSet(this).ReadResultSetHeaderAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+			m_resultSet = await new ResultSet(this).ReadResultSetHeaderAsync(ioBehavior).ConfigureAwait(false);
 			ActivateResultSet(m_resultSet);
 			m_resultSetBuffered = m_resultSet;
 		}

src/MySqlConnector/MySqlClient/Results/ResultSet.cs

@@ -16,7 +16,7 @@ public ResultSet(MySqlDataReader dataReader)
 			DataReader = dataReader;
 		}
 
-		public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
+		public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior)
 		{
 			// ResultSet can be re-used, so initialize everything
 			BufferState = ResultSetState.None;
@@ -34,7 +34,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior, Can
 			{
 				while (true)
 				{
-					var payload = await Session.ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+					var payload = await Session.ReceiveReplyAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);
 
 					var firstByte = payload.HeaderByte;
 					if (firstByte == OkPayload.Signature)
@@ -63,7 +63,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior, Can
 								while ((byteCount = await stream.ReadAsync(readBuffer, 0, readBuffer.Length).ConfigureAwait(false)) > 0)
 								{
 									payload = new PayloadData(new ArraySegment<byte>(readBuffer, 0, byteCount));
-									await Session.SendReplyAsync(payload, ioBehavior, cancellationToken).ConfigureAwait(false);
+									await Session.SendReplyAsync(payload, ioBehavior, CancellationToken.None).ConfigureAwait(false);
 								}
 							}
 						}
@@ -73,7 +73,7 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior, Can
 							ReadResultSetHeaderException = new MySqlException("Error during LOAD DATA LOCAL INFILE", ex);
 						}
 
-						await Session.SendReplyAsync(EmptyPayload.Create(), ioBehavior, cancellationToken).ConfigureAwait(false);
+						await Session.SendReplyAsync(EmptyPayload.Create(), ioBehavior, CancellationToken.None).ConfigureAwait(false);
 					}
 					else
 					{
@@ -85,11 +85,11 @@ public async Task<ResultSet> ReadResultSetHeaderAsync(IOBehavior ioBehavior, Can
 
 						for (var column = 0; column < ColumnDefinitions.Length; column++)
 						{
-							payload = await Session.ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+							payload = await Session.ReceiveReplyAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);
 							ColumnDefinitions[column] = ColumnDefinitionPayload.Create(payload);
 						}
 
-						payload = await Session.ReceiveReplyAsync(ioBehavior, cancellationToken).ConfigureAwait(false);
+						payload = await Session.ReceiveReplyAsync(ioBehavior, CancellationToken.None).ConfigureAwait(false);
 						EofPayload.Create(payload);
 
 						LastInsertId = -1;