Convert 'command timeout' exception to 'connect failed'.

bgrainger · bgrainger · commit 6dbef5bb5547 · 2020-03-26T13:05:49.000-07:00
diff --git a/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs b/src/MySqlConnector/MySql.Data.MySqlClient/MySqlConnection.cs
@@ -664,7 +664,7 @@ private async ValueTask<ServerSession> CreateSessionAsync(ConnectionPool? pool,
 				var messageSuffix = (pool?.IsEmpty ?? false) ? " All pooled connections are in use." : "";
 				throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired." + messageSuffix, ex);
 			}
-			catch (MySqlException ex) when (timeoutSource?.IsCancellationRequested ?? false)
+			catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) || ((MySqlErrorCode) ex.Number == MySqlErrorCode.CommandTimeoutExpired))
 			{
 				throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired.", ex);
 			}

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ private async ValueTask<ServerSession> CreateSessionAsync(ConnectionPool? pool,`
`664`	`664`	`var messageSuffix = (pool?.IsEmpty ?? false) ? " All pooled connections are in use." : "";`
`665`	`665`	`throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired." + messageSuffix, ex);`
`666`	`666`	`}`
`667`		`- catch (MySqlException ex) when (timeoutSource?.IsCancellationRequested ?? false)`
	`667`	`+ catch (MySqlException ex) when ((timeoutSource?.IsCancellationRequested ?? false) \|\| ((MySqlErrorCode) ex.Number == MySqlErrorCode.CommandTimeoutExpired))`
`668`	`668`	`{`
`669`	`669`	`throw new MySqlException(MySqlErrorCode.UnableToConnectToHost, "Connect Timeout expired.", ex);`
`670`	`670`	`}`