Read status info string from OK payload.

Signed-off-by: Bradley Grainger <[email protected]>

Author: bgrainger

src/MySqlConnector/Protocol/Payloads/OkPayload.cs

@@ -11,6 +11,7 @@ internal sealed class OkPayload
 		public ulong LastInsertId { get; }
 		public ServerStatus ServerStatus { get; }
 		public int WarningCount { get; }
+		public string? StatusInfo { get; }
 		public string? NewSchema { get; }
 
 		public const byte Signature = 0x00;
@@ -36,12 +37,13 @@ public static OkPayload Create(ReadOnlySpan<byte> span, bool deprecateEof, bool
 			var serverStatus = (ServerStatus) reader.ReadUInt16();
 			var warningCount = (int) reader.ReadUInt16();
 			string? newSchema = null;
+			ReadOnlySpan<byte> statusBytes;
 
 			if (clientSessionTrack)
 			{
 				if (reader.BytesRemaining > 0)
 				{
-					reader.ReadLengthEncodedByteString(); // human-readable info
+					statusBytes = reader.ReadLengthEncodedByteString(); // human-readable info
 
 					if ((serverStatus & ServerStatus.SessionStateChanged) == ServerStatus.SessionStateChanged && reader.BytesRemaining > 0)
 					{
@@ -65,33 +67,46 @@ public static OkPayload Create(ReadOnlySpan<byte> span, bool deprecateEof, bool
 						}
 					}
 				}
+				else
+				{
+					statusBytes = default;
+				}
 			}
 			else
 			{
-				// ignore "string<EOF> info" human-readable string
+				// read EOF-terminated string
+				statusBytes = reader.ReadByteString(reader.BytesRemaining);
+
+				// try to detect if it was actually a length-prefixed string (up to 250 bytes); some servers send
+				// a length-prefixed status string even when CLIENT_SESSION_TRACK is not specified
+				if (statusBytes.Length != 0 && statusBytes[0] == statusBytes.Length - 1)
+					statusBytes = statusBytes.Slice(1);
 			}
 
-			if (affectedRowCount == 0 && lastInsertId == 0 && warningCount == 0 && newSchema is null)
+			var statusInfo = statusBytes.Length == 0 ? null : Encoding.UTF8.GetString(statusBytes);
+
+			if (affectedRowCount == 0 && lastInsertId == 0 && warningCount == 0 && statusInfo is null && newSchema is null)
 			{
 				if (serverStatus == ServerStatus.AutoCommit)
 					return s_autoCommitOk;
 				if (serverStatus == (ServerStatus.AutoCommit | ServerStatus.SessionStateChanged))
 					return s_autoCommitSessionStateChangedOk;
 			}
 
-			return new OkPayload(affectedRowCount, lastInsertId, serverStatus, warningCount, newSchema);
+			return new OkPayload(affectedRowCount, lastInsertId, serverStatus, warningCount, statusInfo, newSchema);
 		}
 
-		private OkPayload(int affectedRowCount, ulong lastInsertId, ServerStatus serverStatus, int warningCount, string? newSchema)
+		private OkPayload(int affectedRowCount, ulong lastInsertId, ServerStatus serverStatus, int warningCount, string? statusInfo, string? newSchema)
 		{
 			AffectedRowCount = affectedRowCount;
 			LastInsertId = lastInsertId;
 			ServerStatus = serverStatus;
 			WarningCount = warningCount;
+			StatusInfo = statusInfo;
 			NewSchema = newSchema;
 		}
 
-		static readonly OkPayload s_autoCommitOk = new(0, 0, ServerStatus.AutoCommit, 0, null);
-		static readonly OkPayload s_autoCommitSessionStateChangedOk = new(0, 0, ServerStatus.AutoCommit | ServerStatus.SessionStateChanged, 0, null);
+		static readonly OkPayload s_autoCommitOk = new(0, 0, ServerStatus.AutoCommit, 0, null, null);
+		static readonly OkPayload s_autoCommitSessionStateChangedOk = new(0, 0, ServerStatus.AutoCommit | ServerStatus.SessionStateChanged, 0, null, null);
 	}
 }