Implement (Default)CommandTimeout. Fixes #67

bgrainger · bgrainger · commit e28347543296 · 2017-10-19T06:00:19.000-07:00
diff --git a/.ci/config/config.buffer.json b/.ci/config/config.buffer.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true;BufferResultSets=true",
+      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;BufferResultSets=true;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.compression+ssl.json b/.ci/config/config.compression+ssl.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;use compression=true;Use Affected Rows=true",
+      "ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;use compression=true;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.compression.json b/.ci/config/config.compression.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;UseCompression=true;Use Affected Rows=true",
+      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.json b/.ci/config/config.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true",
+      "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.ssl.json b/.ci/config/config.ssl.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;certificate file=../../../../../.ci/server/certs/ssl-client.pfx;Use Affected Rows=true",
+      "ConnectionString": "server=127.0.0.1;user id=ssltest;password=test;port=3306;database=mysqltest;ssl mode=required;certificate file=../../../../../.ci/server/certs/ssl-client.pfx;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.uds+ssl.json b/.ci/config/config.uds+ssl.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;Use Affected Rows=true",
+      "ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/.ci/config/config.uds.json b/.ci/config/config.uds.json
@@ -1,6 +1,6 @@
 {
     "Data": {
-      "ConnectionString": "server=./../../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password='test;key=\"val';database=mysqltest;ssl mode=none;Use Affected Rows=true",
+      "ConnectionString": "server=./../../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password='test;key=\"val';database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
       "PasswordlessUser": "no_password",
       "SecondaryDatabase": "testdb2",
       "SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",
diff --git a/docs/content/connection-options.md b/docs/content/connection-options.md
@@ -162,8 +162,9 @@ These are the other options that MySqlConnector supports.  They are set to sensi
   <tr>
     <td>BufferResultSets, Buffer Result Sets</td>
     <td>false</td>
-    <td>Setting this to true immediately buffers all result sets to memory upon calling ExecuteReader/ExecuteReaderAsync.  This will allow the connection
-      to execute another statement while still holding the original postion of the reader.  Do not use when result sets are bigger than available memory.</td>
+    <td>Setting this to <code>true</code> immediately buffers all result sets to memory upon calling ExecuteReader/ExecuteReaderAsync.  This will allow the connection
+      to execute another statement while still holding the original postion of the reader.  Do not use when result sets are bigger than available memory. When this is <code>true</code>, <code>CommandTimeout</code> will apply to the entire time required to read all the result sets,
+      so must be set to a sufficiently large value.</td>
   </tr>
   <tr>
     <td>Compress, Use Compression, UseCompression</td>
@@ -182,6 +183,13 @@ These are the other options that MySqlConnector supports.  They are set to sensi
     <td>false</td>
     <td>True to have MySqlDataReader.GetValue() and MySqlDataReader.GetDateTime() return DateTime.MinValue for date or datetime columns that have disallowed values.</td>
   </tr>
+  <tr>
+    <td>Default Command Timeout, Command Timeout, DefaultCommandTimeout</td>
+    <td>30</td>
+    <td>The length of time (in seconds) each command can execute before timing out and throwing an exception, or zero to disable timeouts.
+      See the note in the <a href="https://docs.microsoft.com/en-us/dotnet/api/system.data.sqlclient.sqlcommand.commandtimeout">Microsoft documentation</a>
+      for more explanation of how this is determined.</td>
+  </tr>
   <tr>
     <td>Keep Alive, Keepalive</td>
     <td>0</td>
diff --git a/docs/content/tutorials/migrating-from-connector-net.md b/docs/content/tutorials/migrating-from-connector-net.md
@@ -93,6 +93,9 @@ property doesn't reference the active transaction. See [#333](https://github.com
 * [#84701](https://bugs.mysql.com/bug.php?id=84701): Can't create a paramter using a 64-bit enum with a value greater than int.MaxValue
 * [#85185](https://bugs.mysql.com/bug.php?id=85185): `ConnectionReset=True` does not preserve connection charset
 * [#86263](https://bugs.mysql.com/bug.php?id=86263): Transaction isolation level affects all transactions in session
+* [#87307](https://bugs.mysql.com/bug.php?id=87307): NextResult hangs instead of timing out
+* [#87316](https://bugs.mysql.com/bug.php?id=87316): MySqlCommand.CommandTimeout can be set to a negative value
 * [#87868](https://bugs.mysql.com/bug.php?id=87868): `ColumnSize` in schema table is incorrect for `CHAR(36)` and `BLOB` columns
 * [#87876](https://bugs.mysql.com/bug.php?id=87876): `IsLong` is schema table is incorrect for `LONGTEXT` and `LONGBLOB` columns
 * [#88058](https://bugs.mysql.com/bug.php?id=88058): `decimal(n, 0)` has wrong `NumericPrecision`
+* [#88124](https://bugs.mysql.com/bug.php?id=88124): CommandTimeout isn't reset when calling Read/NextResult
diff --git a/src/MySqlConnector/Constants.cs b/src/MySqlConnector/Constants.cs
@@ -0,0 +1,10 @@
+namespace MySql.Data
+{
+	internal static class Constants
+	{
+		/// <summary>
+		/// A sentinel value indicating no (or infinite) timeout.
+		/// </summary>
+		public const int InfiniteTimeout = int.MaxValue;
+	}
+}
diff --git a/src/MySqlConnector/MySqlClient/MySqlCommand.cs b/src/MySqlConnector/MySqlClient/MySqlCommand.cs
@@ -53,11 +53,17 @@ public MySqlCommand(string commandText, MySqlConnection connection, MySqlTransac
 
 		public override void Cancel() => Connection.Cancel(this);
 
-		public override int ExecuteNonQuery() =>
-			ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public override int ExecuteNonQuery()
+		{
+			ResetCommandTimeout();
+			return ExecuteNonQueryAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		}
 
-		public override object ExecuteScalar() =>
-			ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public override object ExecuteScalar()
+		{
+			ResetCommandTimeout();
+			return ExecuteScalarAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		}
 
 		public new MySqlDataReader ExecuteReader() => (MySqlDataReader) base.ExecuteReader();
 
@@ -72,10 +78,15 @@ public override void Prepare()
 		}
 
 		public override string CommandText { get; set; }
-		public override int CommandTimeout { get; set; }
 		public new MySqlConnection Connection { get; set; }
 		public new MySqlTransaction Transaction { get; set; }
 
+		public override int CommandTimeout
+		{
+			get => Math.Min(m_commandTimeout ?? Connection?.DefaultCommandTimeout ?? 0, int.MaxValue / 1000);
+			set => m_commandTimeout = value >= 0 ? value : throw new ArgumentOutOfRangeException(nameof(value), "CommandTimeout must be greater than or equal to zero.");
+		}
+
 		public override CommandType CommandType
 		{
 			get
@@ -127,8 +138,11 @@ protected override DbParameter CreateDbParameter()
 			return new MySqlParameter();
 		}
 
-		protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior) =>
-			ExecuteReaderAsync(behavior, IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
+		{
+			ResetCommandTimeout();
+			return ExecuteReaderAsync(behavior, IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		}
 
 		public override Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken) =>
 			ExecuteNonQueryAsync(Connection.AsyncIOBehavior, cancellationToken);
@@ -144,8 +158,11 @@ internal Task<object> ExecuteScalarAsync(IOBehavior ioBehavior, CancellationToke
 			!IsValid(out var exception) ? Utility.TaskFromException<object>(exception) :
 				m_commandExecutor.ExecuteScalarAsync(CommandText, m_parameterCollection, ioBehavior, cancellationToken);
 
-		protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken) =>
-			ExecuteReaderAsync(behavior, Connection.AsyncIOBehavior, cancellationToken);
+		protected override Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior, CancellationToken cancellationToken)
+		{
+			ResetCommandTimeout();
+			return ExecuteReaderAsync(behavior, Connection.AsyncIOBehavior, cancellationToken);
+		}
 
 		internal Task<DbDataReader> ExecuteReaderAsync(CommandBehavior behavior, IOBehavior ioBehavior, CancellationToken cancellationToken) =>
 			!IsValid(out var exception) ? Utility.TaskFromException<DbDataReader>(exception) :
@@ -185,6 +202,22 @@ internal IDisposable RegisterCancel(CancellationToken token)
 
 		internal int CommandId { get; }
 
+		/// <summary>
+		/// Causes the effective command timeout to be reset back to the value specified by <see cref="CommandTimeout"/>.
+		/// </summary>
+		/// <remarks>As per the <a href="https://msdn.microsoft.com/en-us/library/system.data.sqlclient.sqlcommand.commandtimeout.aspx">MSDN documentation</a>,
+		/// "This property is the cumulative time-out (for all network packets that are read during the invocation of a method) for all network reads during command
+		/// execution or processing of the results. A time-out can still occur after the first row is returned, and does not include user processing time, only network
+		/// read time. For example, with a 30 second time out, if Read requires two network packets, then it has 30 seconds to read both network packets. If you call
+		/// Read again, it will have another 30 seconds to read any data that it requires."
+		/// The <see cref="ResetCommandTimeout"/> method is called by public ADO.NET API methods to reset the effective time remaining at the beginning of a new
+		/// method call.</remarks>
+		internal void ResetCommandTimeout()
+		{
+			var commandTimeout = CommandTimeout;
+			Connection.Session.SetTimeout(commandTimeout == 0 ? Constants.InfiniteTimeout : commandTimeout * 1000);
+		}
+
 		private void VerifyNotDisposed()
 		{
 			if (m_parameterCollection == null)
@@ -212,6 +245,7 @@ private bool IsValid(out Exception exception)
 		static int s_commandId = 1;
 
 		MySqlParameterCollection m_parameterCollection;
+		int? m_commandTimeout;
 		CommandType m_commandType;
 		ICommandExecutor m_commandExecutor;
 		Action m_cancelAction;
diff --git a/src/MySqlConnector/MySqlClient/MySqlConnection.cs b/src/MySqlConnector/MySqlClient/MySqlConnection.cs
@@ -297,6 +297,7 @@ internal async Task<CachedProcedure> GetCachedProcedure(IOBehavior ioBehavior, s
 		internal bool AllowUserVariables => m_connectionSettings.AllowUserVariables;
 		internal bool BufferResultSets => m_connectionSettings.BufferResultSets;
 		internal bool ConvertZeroDateTime => m_connectionSettings.ConvertZeroDateTime;
+		internal int DefaultCommandTimeout => m_connectionSettings.DefaultCommandTimeout;
 		internal bool OldGuids => m_connectionSettings.OldGuids;
 		internal bool TreatTinyAsBoolean => m_connectionSettings.TreatTinyAsBoolean;
 		internal IOBehavior AsyncIOBehavior => m_connectionSettings.ForceSynchronous ? IOBehavior.Synchronous : IOBehavior.Asynchronous;
@@ -347,7 +348,7 @@ private async Task<MySqlSession> CreateSessionAsync(IOBehavior ioBehavior, Cance
 			}
 		}
 
-		private void SetState(ConnectionState newState)
+		internal void SetState(ConnectionState newState)
 		{
 			if (m_connectionState != newState)
 			{
diff --git a/src/MySqlConnector/MySqlClient/MySqlConnectionStringBuilder.cs b/src/MySqlConnector/MySqlClient/MySqlConnectionStringBuilder.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Data.Common;
 using System.Globalization;
@@ -152,6 +152,12 @@ public bool ConvertZeroDateTime
 			set => MySqlConnectionStringOption.ConvertZeroDateTime.SetValue(this, value);
 		}
 
+		public uint DefaultCommandTimeout
+		{
+			get => MySqlConnectionStringOption.DefaultCommandTimeout.GetValue(this);
+			set => MySqlConnectionStringOption.DefaultCommandTimeout.SetValue(this, value);
+		}
+
 		public bool ForceSynchronous
 		{
 			get => MySqlConnectionStringOption.ForceSynchronous.GetValue(this);
@@ -274,6 +280,7 @@ internal abstract class MySqlConnectionStringOption
 		public static readonly MySqlConnectionStringOption<string> CharacterSet;
 		public static readonly MySqlConnectionStringOption<uint> ConnectionTimeout;
 		public static readonly MySqlConnectionStringOption<bool> ConvertZeroDateTime;
+		public static readonly MySqlConnectionStringOption<uint> DefaultCommandTimeout;
 		public static readonly MySqlConnectionStringOption<bool> ForceSynchronous;
 		public static readonly MySqlConnectionStringOption<uint> Keepalive;
 		public static readonly MySqlConnectionStringOption<bool> OldGuids;
@@ -401,6 +408,10 @@ static MySqlConnectionStringOption()
 				keys: new[] { "Convert Zero Datetime", "ConvertZeroDateTime" },
 				defaultValue: false));
 
+			AddOption(DefaultCommandTimeout = new MySqlConnectionStringOption<uint>(
+				keys: new[] { "Default Command Timeout", "DefaultCommandTimeout", "Command Timeout" },
+				defaultValue: 30u));
+
 			AddOption(ForceSynchronous = new MySqlConnectionStringOption<bool>(
 				keys: new[] { "ForceSynchronous" },
 				defaultValue: false));
diff --git a/src/MySqlConnector/MySqlClient/MySqlDataReader.cs b/src/MySqlConnector/MySqlClient/MySqlDataReader.cs
@@ -19,18 +19,32 @@ public sealed class MySqlDataReader : DbDataReader
 		, IDbColumnSchemaGenerator
 #endif
 	{
-		public override bool NextResult() =>
-			NextResultAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		public override bool NextResult()
+		{
+			Command.ResetCommandTimeout();
+			return NextResultAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult();
+		}
 
-		public override bool Read() => GetResultSet().Read();
+		public override bool Read()
+		{
+			Command.ResetCommandTimeout();
+			return GetResultSet().Read();
+		}
 
-		public override Task<bool> ReadAsync(CancellationToken cancellationToken) => GetResultSet().ReadAsync(cancellationToken);
+		public override Task<bool> ReadAsync(CancellationToken cancellationToken)
+		{
+			Command.ResetCommandTimeout();
+			return GetResultSet().ReadAsync(cancellationToken);
+		}
 
 		internal Task<bool> ReadAsync(IOBehavior ioBehavior, CancellationToken cancellationToken) =>
 			GetResultSet().ReadAsync(ioBehavior, cancellationToken);
 
-		public override Task<bool> NextResultAsync(CancellationToken cancellationToken) =>
-			NextResultAsync(Command.Connection.AsyncIOBehavior, cancellationToken);
+		public override Task<bool> NextResultAsync(CancellationToken cancellationToken)
+		{
+			Command.ResetCommandTimeout();
+			return NextResultAsync(Command.Connection.AsyncIOBehavior, cancellationToken);
+		}
 
 		internal async Task<bool> NextResultAsync(IOBehavior ioBehavior, CancellationToken cancellationToken)
 		{
@@ -402,9 +416,10 @@ private void DoClose()
 			{
 				if (m_resultSet != null)
 				{
+					Command.Connection.Session.SetTimeout(Constants.InfiniteTimeout);
 					try
 					{
-						while (NextResult())
+						while (NextResultAsync(IOBehavior.Synchronous, CancellationToken.None).GetAwaiter().GetResult())
 						{
 						}
 					}
diff --git a/src/MySqlConnector/MySqlClient/MySqlErrorCode.g.cs b/src/MySqlConnector/MySqlClient/MySqlErrorCode.g.cs
@@ -6,6 +6,11 @@ namespace MySql.Data.MySqlClient
 	[System.CodeDom.Compiler.GeneratedCode("https://gist.github.com/bgrainger/791cecb647d514a9dd2f3d83b2387e49", "2")]
 	public enum MySqlErrorCode
 	{
+		/// <summary>
+		/// The timeout period specified by <see cref="MySqlCommand.CommandTimeout"/> elapsed before the operation completed.
+		/// </summary>
+		CommandTimeoutExpired = -1,
+
 		/// <summary>
 		/// ER_HASHCHK
 		/// </summary>
diff --git a/src/MySqlConnector/MySqlClient/MySqlException.cs b/src/MySqlConnector/MySqlClient/MySqlException.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Data.Common;
 
 namespace MySql.Data.MySqlClient
@@ -29,5 +29,10 @@ internal MySqlException(int errorNumber, string sqlState, string message, Except
 			Number = errorNumber;
 			SqlState = sqlState;
 		}
+
+		internal static MySqlException CreateForTimeout() => CreateForTimeout(null);
+
+		internal static MySqlException CreateForTimeout(Exception innerException) =>
+			new MySqlException((int) MySqlErrorCode.CommandTimeoutExpired, null, "The Command Timeout expired before the operation completed.");
 	}
 }
diff --git a/src/MySqlConnector/Protocol/Serialization/BufferedByteReader.cs b/src/MySqlConnector/Protocol/Serialization/BufferedByteReader.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Threading.Tasks;
 
 namespace MySql.Data.Protocol.Serialization
@@ -35,7 +35,7 @@ private ValueTask<ArraySegment<byte>> ReadBytesAsync(IByteHandler byteHandler, A
 		{
 			// keep reading data synchronously while it is available
 			var readBytesTask = byteHandler.ReadBytesAsync(buffer, ioBehavior);
-			while (readBytesTask.IsCompleted)
+			while (readBytesTask.IsCompletedSuccessfully)
 			{
 				ValueTask<ArraySegment<byte>> result;
 				if (HasReadAllData(readBytesTask.Result, ref buffer, totalBytesToRead, out result))
diff --git a/src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs b/src/MySqlConnector/Protocol/Serialization/CompressedPayloadHandler.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.IO;
 using System.IO.Compression;
 using System.Threading.Tasks;
@@ -254,6 +254,12 @@ public void Dispose()
 			{
 			}
 
+			public int RemainingTimeout
+			{
+				get => m_compressedPayloadHandler.ByteHandler.RemainingTimeout;
+				set => m_compressedPayloadHandler.ByteHandler.RemainingTimeout = value;
+			}
+
 			public ValueTask<int> ReadBytesAsync(ArraySegment<byte> buffer, IOBehavior ioBehavior) =>
 				m_compressedPayloadHandler.ReadBytesAsync(buffer, m_protocolErrorBehavior, ioBehavior);
 
diff --git a/src/MySqlConnector/Protocol/Serialization/IByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/IByteHandler.cs
@@ -1,10 +1,15 @@
-﻿using System;
+using System;
 using System.Threading.Tasks;
 
 namespace MySql.Data.Protocol.Serialization
 {
 	internal interface IByteHandler : IDisposable
 	{
+		/// <summary>
+		/// The remaining timeout (in milliseconds) for the next I/O read. Use <see cref="Constants.InfiniteTimeout"/> to represent no (or, infinite) timeout.
+		/// </summary>
+		int RemainingTimeout { get; set; }
+
 		/// <summary>
 		/// Reads data from this byte handler.
 		/// </summary>
diff --git a/src/MySqlConnector/Protocol/Serialization/SocketByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/SocketByteHandler.cs
diff --git a/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs b/src/MySqlConnector/Protocol/Serialization/StreamByteHandler.cs
diff --git a/src/MySqlConnector/Serialization/ConnectionSettings.cs b/src/MySqlConnector/Serialization/ConnectionSettings.cs
diff --git a/src/MySqlConnector/Serialization/MySqlSession.cs b/src/MySqlConnector/Serialization/MySqlSession.cs
diff --git a/src/MySqlConnector/TimerQueue.cs b/src/MySqlConnector/TimerQueue.cs
diff --git a/tests/MySqlConnector.Tests/MySqlConnectionStringBuilderTests.cs b/tests/MySqlConnector.Tests/MySqlConnectionStringBuilderTests.cs
diff --git a/tests/SideBySide/CommandTimeoutTests.cs b/tests/SideBySide/CommandTimeoutTests.cs
diff --git a/tests/SideBySide/config.json.example b/tests/SideBySide/config.json.example

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Data": {`
`3`		`- "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;Use Affected Rows=true;BufferResultSets=true",`
	`3`	`+ "ConnectionString": "server=127.0.0.1;user id=mysqltest;password='test;key=\"val';port=3306;database=mysqltest;ssl mode=none;BufferResultSets=true;DefaultCommandTimeout=3600",`
`4`	`4`	`"PasswordlessUser": "no_password",`
`5`	`5`	`"SecondaryDatabase": "testdb2",`
`6`	`6`	`"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Data": {`
`3`		`- "ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;Use Affected Rows=true",`
	`3`	`+ "ConnectionString": "server=./../../../../../.ci/mysqld/mysqld.sock;user id=ssltest;password=test;database=mysqltest;ssl mode=required;DefaultCommandTimeout=3600",`
`4`	`4`	`"PasswordlessUser": "no_password",`
`5`	`5`	`"SecondaryDatabase": "testdb2",`
`6`	`6`	`"SupportedFeatures": "Json,StoredProcedures,Sha256Password,LargePackets",`