Merge mariadb-11.6 into master.

Author: bgrainger

.ci/docker-run.sh

@@ -26,9 +26,9 @@ MYSQL_EXTRA=
 MYSQL=mysql
 
 if [[ "$IMAGE" == mariadb* ]]; then
-  MYSQL_EXTRA='--in-predicate-conversion-threshold=100000'
+  MYSQL_EXTRA='--in-predicate-conversion-threshold=100000 --plugin-maturity=beta'
 fi
-if [ "$IMAGE" == "mariadb:11.4" ]; then
+if [ "$IMAGE" == "mariadb:11.4" ] || [ "$IMAGE" == "mariadb:11.6" ]; then
   MYSQL='mariadb'
 fi
 

azure-pipelines.yml

@@ -192,6 +192,10 @@ jobs:
         image: 'mariadb:11.4'
         connectionStringExtra: ''
         unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin,Redirection'
+      'MariaDB 11.6':
+        image: 'mariadb:11.6'
+        connectionStringExtra: ''
+        unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Redirection,Sha256Password,Tls11,UuidToBin'
   steps:
   - template: '.ci/integration-tests-steps.yml'
     parameters:

docs/content/home.md

@@ -64,7 +64,7 @@ Server  | Versions | Notes
 Amazon Aurora RDS | 2.x, 3.x | Use `Pipelining=False` [for Aurora 2.x](https://mysqlconnector.net/troubleshooting/aurora-freeze/)
 Azure Database for MySQL | 5.7, 8.0 | Single Server and Flexible Server
 Google Cloud SQL for MySQL | 5.6, 5.7, 8.0 |
-MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.4**) |
+MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.4**, **11.6**) |
 MySQL | 5.5, 5.6, 5.7, 8.x (**8.0**, **8.4**), 9.x (**9.2**) | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 and 5.7 are EOL
 Percona Server | 5.6, 5.7, 8.0 |
 PlanetScale | | See PlanetScale [MySQL compatibility notes](https://planetscale.com/docs/reference/mysql-compatibility)

src/MySqlConnector/Protocol/CharacterSet.cs

@@ -296,9 +296,11 @@ internal enum CharacterSet : ushort
 	Utf8Mb3CroatianCaseInsensitiveMariaDb = 576,
 	Utf8Mb3MyanmarCaseInsensitive = 577,
 	Utf8Mb3ThaiUnicode520Weight2 = 578,
+	Utf8Mb3General1400AccentSensitiveCaseInsensitive = 579,
 	Utf8Mb4CroatianCaseInsensitiveMariaDb = 608,
 	Utf8Mb4MyanmarCaseInsensitive = 609,
 	Utf8Mb4ThaiUnicode520Weight2 = 610,
+	Utf8Mb4General1400AccentSensitiveCaseInsensitive = 611,
 	Ucs2CroatianCaseInsensitiveMariaDb = 640,
 	Ucs2MyanmarCaseInsensitive = 641,
 	Ucs2ThaiUnicode520Weight2 = 642,

src/MySqlConnector/Protocol/Serialization/ProtocolUtility.cs

@@ -225,6 +225,7 @@ public static int GetBytesPerCharacter(CharacterSet characterSet)
 			case CharacterSet.Utf8Mb3CroatianCaseInsensitiveMariaDb:
 			case CharacterSet.Utf8Mb3MyanmarCaseInsensitive:
 			case CharacterSet.Utf8Mb3ThaiUnicode520Weight2:
+			case CharacterSet.Utf8Mb3General1400AccentSensitiveCaseInsensitive:
 			case CharacterSet.UjisJapaneseNoPadCaseInsensitive:
 			case CharacterSet.Utf8Mb3GeneralNoPadCaseInsensitive:
 			case CharacterSet.Utf8Mb3NoPadBinary:
@@ -384,6 +385,7 @@ public static int GetBytesPerCharacter(CharacterSet characterSet)
 			case CharacterSet.Utf8Mb4CroatianCaseInsensitiveMariaDb:
 			case CharacterSet.Utf8Mb4MyanmarCaseInsensitive:
 			case CharacterSet.Utf8Mb4ThaiUnicode520Weight2:
+			case CharacterSet.Utf8Mb4General1400AccentSensitiveCaseInsensitive:
 			case CharacterSet.Utf16CroatianCaseInsensitiveMariaDb:
 			case CharacterSet.Utf16MyanmarCaseInsensitive:
 			case CharacterSet.Utf16ThaiUnicode520Weight2:

tests/IntegrationTests/CharacterSetTests.cs

@@ -79,7 +79,7 @@ public void CollationConnection(bool reopenConnection)
 
 		var collation = connection.Query<string>(@"select @@collation_connection;").Single();
 		var expected = connection.ServerVersion.Substring(0, 2) is "8." or "9." ? "utf8mb4_0900_ai_ci" :
-			connection.ServerVersion.StartsWith("11.4.", StringComparison.Ordinal) ? "utf8mb4_uca1400_ai_ci" :
+			connection.ServerVersion.StartsWith("11.4.", StringComparison.Ordinal) || connection.ServerVersion.StartsWith("11.6.", StringComparison.Ordinal) ? "utf8mb4_uca1400_ai_ci" :
 			"utf8mb4_general_ci";
 		Assert.Equal(expected, collation);
 	}

tests/IntegrationTests/TestUtilities.cs

@@ -79,11 +79,18 @@ private static async Task AssertExecuteScalarReturnsOneOrThrowsExceptionAsync(My
 		}
 		else
 		{
-			var ex = await Assert.ThrowsAsync<MySqlException>(async () => await command.ExecuteScalarAsync(token));
+			var ex = await Assert.ThrowsAnyAsync<Exception>(async () => await command.ExecuteScalarAsync(token));
+			MySqlException exception = ex as MySqlException;
+			while (exception is null && ex is not null)
+			{
+				ex = ex.InnerException;
+				exception = ex as MySqlException;
+			}
+			Assert.NotNull(exception);
 #if MYSQL_DATA
-			Assert.Equal((int) expectedCode, ex.Number);
+			Assert.Equal((int) expectedCode, exception.Number);
 #else
-			Assert.Equal(expectedCode, ex.ErrorCode);
+			Assert.Equal(expectedCode, exception.ErrorCode);
 #endif
 		}
 	}