Merge v1.3 into master.

bgrainger · bgrainger · commit 5b625ce3000a · 2021-09-21T14:52:06.000-07:00
Conflicts:
	src/MySqlConnector/Core/ConnectionPool.cs
diff --git a/src/MySqlConnector/Core/ConnectionPool.cs b/src/MySqlConnector/Core/ConnectionPool.cs
@@ -28,7 +28,7 @@ public async ValueTask<ServerSession> GetSessionAsync(MySqlConnection connection
 		// on the lock in RecoverLeakedSessions in high-concurrency situations
 		if (IsEmpty && unchecked(((uint) Environment.TickCount) - m_lastRecoveryTime) >= 1000u)
 		{
-			Log.Debug("Pool{0} is empty; trying to recover any leaked sessions", m_logArguments);
+			Log.Debug("Pool{0} is empty; scanning for any leaked sessions", m_logArguments);
 			await RecoverLeakedSessionsAsync(ioBehavior).ConfigureAwait(false);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async ValueTask<ServerSession> GetSessionAsync(MySqlConnection connection`
`28`	`28`	`// on the lock in RecoverLeakedSessions in high-concurrency situations`
`29`	`29`	`if (IsEmpty && unchecked(((uint) Environment.TickCount) - m_lastRecoveryTime) >= 1000u)`
`30`	`30`	`{`
`31`		`- Log.Debug("Pool{0} is empty; trying to recover any leaked sessions", m_logArguments);`
	`31`	`+ Log.Debug("Pool{0} is empty; scanning for any leaked sessions", m_logArguments);`
`32`	`32`	`await RecoverLeakedSessionsAsync(ioBehavior).ConfigureAwait(false);`
`33`	`33`	`}`
`34`	`34`