Improve MariaDB version parsing. Fixes #617

Author: bgrainger

src/MySqlConnector/Core/ServerVersion.cs

@@ -24,18 +24,27 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 			Version = new Version(major, minor, build);
 
 			// check for MariaDB version appended to a fake MySQL version
-			if (versionString.Length != 0 && versionString[0] == 0x2D && versionString.IndexOf(MariaDb) != -1)
+			if (versionString.Length != 0 && versionString[0] == 0x2D)
 			{
 				versionString = versionString.Slice(1);
-				if (Utf8Parser.TryParse(versionString, out major, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
+				var mariaDbIndex = versionString.IndexOf(MariaDb);
+				if (mariaDbIndex != -1)
 				{
-					versionString = versionString.Slice(bytesConsumed + 1);
-					if (Utf8Parser.TryParse(versionString, out minor, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
+					var totalBytesRead = 0;
+					if (Utf8Parser.TryParse(versionString, out major, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
 					{
 						versionString = versionString.Slice(bytesConsumed + 1);
-						if (Utf8Parser.TryParse(versionString, out build, out bytesConsumed) && versionString[bytesConsumed] == 0x2D)
+						totalBytesRead += bytesConsumed + 1;
+						if (Utf8Parser.TryParse(versionString, out minor, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
 						{
-							MariaDbVersion = new Version(major, minor, build);
+							versionString = versionString.Slice(bytesConsumed + 1);
+							totalBytesRead += bytesConsumed + 1;
+							if (Utf8Parser.TryParse(versionString, out build, out bytesConsumed) && versionString[bytesConsumed] == 0x2D)
+							{
+								totalBytesRead += bytesConsumed;
+								if (totalBytesRead == mariaDbIndex)
+									MariaDbVersion = new Version(major, minor, build);
+							}
 						}
 					}
 				}
@@ -46,6 +55,6 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 		public Version Version { get; }
 		public Version MariaDbVersion { get; }
 
-		static ReadOnlySpan<byte> MariaDb => new byte[] { 0x2D, 0x4D, 0x61, 0x72, 0x69, 0x61, 0x44, 0x42, 0x2D }; // -MariaDB-
+		static ReadOnlySpan<byte> MariaDb => new byte[] { 0x2D, 0x4D, 0x61, 0x72, 0x69, 0x61, 0x44, 0x42 }; // -MariaDB
 	}
 }

tests/MySqlConnector.Tests/ServerVersionTests.cs

@@ -9,11 +9,16 @@ public class ServerVersionTests
 	{
 		[Theory]
 		[InlineData("5.5.5-10.1.38-MariaDB-1~bionic", "5.5.5", "10.1.38")]
+		[InlineData("5.5.5-10.2.13-MariaDB", "5.5.5", "10.2.13")]
 		[InlineData("5.5.5-10.2.19-MariaDB-1:10.2.19+maria~bionic", "5.5.5", "10.2.19")]
 		[InlineData("5.5.5-10.3.13-MariaDB-1:10.3.13+maria~bionic", "5.5.5", "10.3.13")]
 		[InlineData("5.7.21-log", "5.7.21", null)]
 		[InlineData("8.0.13", "8.0.13", null)]
 		[InlineData("5.7.25-28", "5.7.25", null)]
+		[InlineData("5.7.25-", "5.7.25", null)]
+		[InlineData("5.7.25-10.2.3", "5.7.25", null)]
+		[InlineData("5.7.25-MariaDB-10.2.3", "5.7.25", null)]
+		[InlineData("5.7.25-10.2.3-10.3.19-MariaDB-1", "5.7.25", null)]
 		public void ParseServerVersion(string input, string expectedString, string expectedMariaDbString)
 		{
 			var serverVersion = new ServerVersion(Encoding.UTF8.GetBytes(input));