Skip to content

Commit e2a0f58

Browse files
committed
Run integration tests on MariaDB 11.4.
This is the latest LTS version.
1 parent 32cf84c commit e2a0f58

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.ci/docker-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ MYSQL=mysql
2828
if [[ "$IMAGE" == mariadb* ]]; then
2929
MYSQL_EXTRA='--in-predicate-conversion-threshold=100000'
3030
fi
31-
if [ "$IMAGE" == "mariadb:11.2" ]; then
31+
if [ "$IMAGE" == "mariadb:11.4" ]; then
3232
MYSQL='mariadb'
3333
fi
3434

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ jobs:
245245
image: 'mariadb:10.11'
246246
connectionStringExtra: ''
247247
unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
248-
'MariaDB 11.2':
249-
image: 'mariadb:11.2'
248+
'MariaDB 11.4':
249+
image: 'mariadb:11.4'
250250
connectionStringExtra: ''
251251
unsupportedFeatures: 'CachingSha2Password,CancelSleepSuccessfully,Json,RoundDateTime,QueryAttributes,Sha256Password,Tls11,UuidToBin'
252252
steps:

docs/content/home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Server | Versions | Notes
6464
Amazon Aurora RDS | 2.x, 3.x | Use `Pipelining=False` [for Aurora 2.x](https://mysqlconnector.net/troubleshooting/aurora-freeze/)
6565
Azure Database for MySQL | 5.7, 8.0 | Single Server and Flexible Server
6666
Google Cloud SQL for MySQL | 5.6, 5.7, 8.0 |
67-
MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.2**) |
67+
MariaDB | 10.x (**10.6**, **10.11**), 11.x (**11.4**) |
6868
MySQL | 5.5, 5.6, 5.7, 8.x (**8.0**, **8.4**), **9.0** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 and 5.7 are EOL
6969
Percona Server | 5.6, 5.7, 8.0 |
7070
PlanetScale | | See PlanetScale [MySQL compatibility notes](https://planetscale.com/docs/reference/mysql-compatibility)

tests/IntegrationTests/CharacterSetTests.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ public void CollationConnection(bool reopenConnection)
7878
}
7979

8080
var collation = connection.Query<string>(@"select @@collation_connection;").Single();
81-
var expected = connection.ServerVersion.Substring(0, 2) is "8." or "9." ? "utf8mb4_0900_ai_ci" : "utf8mb4_general_ci";
81+
var expected = connection.ServerVersion.Substring(0, 2) is "8." or "9." ? "utf8mb4_0900_ai_ci" :
82+
connection.ServerVersion.StartsWith("11.4.", StringComparison.Ordinal) ? "utf8mb4_uca1400_ai_ci" :
83+
"utf8mb4_general_ci";
8284
Assert.Equal(expected, collation);
8385
}
8486

0 commit comments

Comments
 (0)