Add connect timeout exception number in more places.

Author: bgrainger

docs/content/tutorials/migrating-from-connector-net.md

@@ -143,3 +143,4 @@ The following bugs in Connector/NET are fixed by switching to MySqlConnector. (~
 * [#93374](https://bugs.mysql.com/bug.php?id=93374): `MySqlDataReader.GetStream` throws `IndexOutOfRangeException`
 * [#93825](https://bugs.mysql.com/bug.php?id=93825): `MySqlException` loses data when serialized
 * [#94075](https://bugs.mysql.com/bug.php?id=94075): `MySqlCommand.Cancel` throws exception
+* [#94760](https://bugs.mysql.com/bug.php?id=94760): `MySqlConnection.OpenAsync(CancellationToken)` doesn’t respect cancellation token

src/MySqlConnector/Core/ServerSession.cs

@@ -782,7 +782,7 @@ private async Task<bool> OpenTcpSocketAsync(ConnectionSettings cs, ILoadBalancer
 							{
 								SafeDispose(ref tcpClient);
 								Log.Info("Session{0} connect timeout expired connecting to IpAddress {1} for HostName '{2}'", m_logArguments[0], ipAddress, hostName);
-								throw new MySqlException("Connect Timeout expired.", ex);
+								throw new MySqlException((int) MySqlErrorCode.UnableToConnectToHost, null, "Connect Timeout expired.", ex);
 							}
 						}
 					}

tests/SideBySide/ConnectAsync.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Security.Authentication;
+using System.Threading;
 using System.Threading.Tasks;
 using MySql.Data.MySqlClient;
 using Xunit;
@@ -129,15 +130,51 @@ public async Task ConnectTimeoutAsync()
 			{
 				Server = "www.mysql.com",
 				Pooling = false,
-				ConnectionTimeout = 3,
+				ConnectionTimeout = 2,
 			};
 
 			using (var connection = new MySqlConnection(csb.ConnectionString))
 			{
 				var stopwatch = Stopwatch.StartNew();
-				await Assert.ThrowsAsync<MySqlException>(async () => await connection.OpenAsync());
+				try
+				{
+					await connection.OpenAsync();
+					Assert.True(false);
+				}
+				catch (MySqlException ex)
+				{
+					Assert.Equal((int) MySqlErrorCode.UnableToConnectToHost, ex.Number);
+				}
+				stopwatch.Stop();
+				TestUtilities.AssertDuration(stopwatch, 1900, 1500);
+			}
+		}
+
+
+		[SkippableFact(ServerFeatures.Timeout, Baseline = "https://bugs.mysql.com/bug.php?id=94760")]
+		public async Task ConnectTimeoutAsyncCancellationToken()
+		{
+			var csb = new MySqlConnectionStringBuilder
+			{
+				Server = "www.mysql.com",
+				Pooling = false,
+			};
+
+			using (var connection = new MySqlConnection(csb.ConnectionString))
+			{
+				var stopwatch = Stopwatch.StartNew();
+				try
+				{
+					using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(2)))
+						await connection.OpenAsync(cts.Token);
+					Assert.True(false);
+				}
+				catch (MySqlException ex)
+				{
+					Assert.Equal((int) MySqlErrorCode.UnableToConnectToHost, ex.Number);
+				}
 				stopwatch.Stop();
-				TestUtilities.AssertDuration(stopwatch, 2900, 1500);
+				TestUtilities.AssertDuration(stopwatch, 1900, 1500);
 			}
 		}