Attempt to parse the MariaDB version if it can be found.

Author: bgrainger

src/MySqlConnector/Core/ServerVersion.cs

@@ -19,11 +19,33 @@ public ServerVersion(ReadOnlySpan<byte> versionString)
 			versionString = versionString.Slice(bytesConsumed + 1);
 			if (!Utf8Parser.TryParse(versionString, out int build, out bytesConsumed))
 				throw new InvalidOperationException("Error parsing " + OriginalString);
+			versionString = versionString.Slice(bytesConsumed);
 
 			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)
+			{
+				versionString = versionString.Slice(1);
+				if (Utf8Parser.TryParse(versionString, out major, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
+				{
+					versionString = versionString.Slice(bytesConsumed + 1);
+					if (Utf8Parser.TryParse(versionString, out minor, out bytesConsumed) && versionString[bytesConsumed] == 0x2E)
+					{
+						versionString = versionString.Slice(bytesConsumed + 1);
+						if (Utf8Parser.TryParse(versionString, out build, out bytesConsumed) && versionString[bytesConsumed] == 0x2D)
+						{
+							MariaDbVersion = new Version(major, minor, build);
+						}
+					}
+				}
+			}
 		}
 
 		public string OriginalString { get; }
 		public Version Version { get; }
+		public Version MariaDbVersion { get; }
+
+		static ReadOnlySpan<byte> MariaDb => new byte[] { 0x2D, 0x4D, 0x61, 0x72, 0x69, 0x61, 0x44, 0x42, 0x2D }; // -MariaDB-
 	}
 }

tests/MySqlConnector.Tests/ServerVersionTests.cs

@@ -8,16 +8,27 @@ namespace MySqlConnector.Tests
 	public class ServerVersionTests
 	{
 		[Theory]
-		[InlineData("5.5.5-10.1.38-MariaDB-1~bionic", "5.5.5")]
-		[InlineData("5.5.5-10.2.19-MariaDB-1:10.2.19+maria~bionic", "5.5.5")]
-		[InlineData("5.5.5-10.3.13-MariaDB-1:10.3.13+maria~bionic", "5.5.5")]
-		[InlineData("5.7.21-log", "5.7.21")]
-		[InlineData("8.0.13", "8.0.13")]
-		[InlineData("5.7.25-28", "5.7.25")]
-		public void ParseServerVersion(string serverVersion, string expectedString)
+		[InlineData("5.5.5-10.1.38-MariaDB-1~bionic", "5.5.5", "10.1.38")]
+		[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)]
+		public void ParseServerVersion(string input, string expectedString, string expectedMariaDbString)
 		{
+			var serverVersion = new ServerVersion(Encoding.UTF8.GetBytes(input));
 			var expected = Version.Parse(expectedString);
-			Assert.Equal(expected, new ServerVersion(Encoding.UTF8.GetBytes(serverVersion)).Version);
+			Assert.Equal(expected, serverVersion.Version);
+
+			if (expectedMariaDbString == null)
+			{
+				Assert.Equal(default(Version), serverVersion.MariaDbVersion);
+			}
+			else
+			{
+				var expectedMariaDb = Version.Parse(expectedMariaDbString);
+				Assert.Equal(expectedMariaDb, serverVersion.MariaDbVersion);
+			}
 		}
 	}
 }