Skip to content

Commit 59bf391

Browse files
committed
Add MySQL 8.1 to integration test suite.
1 parent 1f10081 commit 59bf391

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.ci/docker-run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ OMIT_FEATURES=$3
2525
MYSQL_EXTRA=
2626
MYSQL=mysql
2727

28-
if [ "$IMAGE" == "mysql:8.0" ]; then
28+
if [[ "$IMAGE" == mysql:8.0 || "$IMAGE" == mysql:8.1 ]]; then
2929
MYSQL_EXTRA='--default-authentication-plugin=mysql_native_password'
3030
fi
3131
if [[ "$IMAGE" == mariadb* ]]; then

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,6 @@ jobs:
181181
vmimage: 'ubuntu-20.04'
182182
strategy:
183183
matrix:
184-
'MySQL 5.6':
185-
image: 'mysql:5.6'
186-
connectionStringExtra: ''
187-
unsupportedFeatures: 'CachingSha2Password,Ed25519,Json,LargePackets,QueryAttributes,ResetConnection,SessionTrack,Sha256Password,Tls11,Tls13,UuidToBin'
188184
'MySQL 5.7':
189185
image: 'mysql:5.7'
190186
connectionStringExtra: 'Tls Cipher Suites=TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_DHE_RSA_WITH_AES_128_CBC_SHA256'
@@ -193,6 +189,10 @@ jobs:
193189
image: 'mysql:8.0'
194190
connectionStringExtra: ''
195191
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
192+
'MySQL 8.1':
193+
image: 'mysql:8.1'
194+
connectionStringExtra: ''
195+
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
196196
'MariaDB 10.6':
197197
image: 'mariadb:10.6'
198198
connectionStringExtra: ''

docs/content/home.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Amazon Aurora RDS | 2.x, 3.x | Use `Pipelining=False` [for Aurora 2.x](https://m
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 |
6767
MariaDB | 10.x, 11.x (**10.6**, **10.11**, **11.0**) |
68-
MySQL | 5.5, **5.6**, **5.7**, **8.0** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 is EOL
68+
MySQL | 5.5, 5.6, **5.7**, **8.0**, **8.1** | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 is EOL
6969
Percona Server | 5.6, 5.7, 8.0 |
7070
PlanetScale | | See PlanetScale [MySQL compatibility notes](https://planetscale.com/docs/reference/mysql-compatibility)
7171
ProxySQL | 2.x | Some [compatibility issues](https://github.com/search?q=repo%3Amysql-net%2FMySqlConnector+proxysql&type=issues)

tests/IntegrationTests/CharacterSetTests.cs

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

8080
var collation = connection.Query<string>(@"select @@collation_connection;").Single();
81-
var expected = connection.ServerVersion.StartsWith("8.0") ? "utf8mb4_0900_ai_ci" : "utf8mb4_general_ci";
81+
var expected = connection.ServerVersion.StartsWith("8.", StringComparison.Ordinal) ? "utf8mb4_0900_ai_ci" : "utf8mb4_general_ci";
8282
Assert.Equal(expected, collation);
8383
}
8484

0 commit comments

Comments
 (0)