Test with newer MariaDB versions.

Author: bgrainger

azure-pipelines.yml

@@ -204,14 +204,14 @@ jobs:
       'MySQL 8.0':
         image: 'mysql:8.0'
         unsupportedFeatures: 'Ed25519,Tls11,ZeroDateTime'
-      'MariaDB 10.2':
-        image: 'mariadb:10.2'
-        unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
-      'MariaDB 10.3':
-        image: 'mariadb:10.3-bionic'
-        unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
       'MariaDB 10.4':
-        image: 'mariadb:10.4.12'
+        image: 'mariadb:10.4'
+        unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
+      'MariaDB 10.5':
+        image: 'mariadb:10.5'
+        unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
+      'MariaDB 10.6':
+        image: 'mariadb:10.6'
         unsupportedFeatures: 'CachingSha2Password,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
   steps:
   - template: '.ci/integration-tests-steps.yml'

tests/SideBySide/DataTypes.cs

@@ -451,9 +451,9 @@ public async Task QueryWithGuidParameter(bool oldGuids)
 			Assert.Equal(oldGuids ? 0L : 1L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_strings where guid = @guid", new { guid = new Guid("fd24a0e8-c3f2-4821-a456-35da2dc4bb8f") }).ConfigureAwait(false)).SingleOrDefault());
 			Assert.Equal(oldGuids ? 0L : 1L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_strings where guidbin = @guid", new { guid = new Guid("fd24a0e8-c3f2-4821-a456-35da2dc4bb8f") }).ConfigureAwait(false)).SingleOrDefault());
 		}
-		catch (MySqlException ex) when (oldGuids && ex.Number == 3854 /* MySqlErrorCode.CannotConvertString */)
+		catch (MySqlException ex) when (oldGuids && ex.Number is 1300 or 3854) // InvalidCharacterString, CannotConvertString
 		{
-			// new error in MySQL 8.0.24
+			// new error in MySQL 8.0.24, MariaDB 10.5
 		}
 		Assert.Equal(oldGuids ? 1L : 0L, (await connection.QueryAsync<long>(@"select count(*) from datatypes_blobs where guidbin = @guid", new { guid = new Guid(0x33221100, 0x5544, 0x7766, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF) }).ConfigureAwait(false)).SingleOrDefault());
 	}

tests/SideBySide/SchemaProviderTests.cs

@@ -89,15 +89,15 @@ public async Task GetCharacterSetsSchemaAsync()
 		var table = await m_database.Connection.GetSchemaAsync("CharacterSets");
 		Assert.Equal(4, table.Columns.Count);
 		Assert.Contains("latin1", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
-		Assert.Contains("utf8", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
+		Assert.Contains("ascii", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
 	}
 
 	[Fact]
 	public void GetCollationsSchema()
 	{
 		var table = m_database.Connection.GetSchema("Collations");
 		Assert.Contains("latin1_general_ci", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
-		Assert.Contains("utf8_bin", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
+		Assert.Contains("ascii_bin", table.Rows.Cast<DataRow>().Select(x => (string) x[0]));
 	}
 #endif