Skip to content

Commit 23201a1

Browse files
bgraingerbgrainger
committed
Update MySQL versions to 9.5.0.
Change SSLMode=None to Disabled for compatibility with MySql.Data 9.5.0: https://bugs.mysql.com/bug.php?id=119211; cf. #1168.
1 parent cffaecc commit 23201a1

File tree

12 files changed

+21
-17
lines changed

12 files changed

+21
-17
lines changed

‎.ci/config/config.compression.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;UseCompression=true;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
3+
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=disabled;UseCompression=true;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
44
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",

‎.ci/config/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
3+
"ConnectionString": "server=127.0.0.1;user id=mysqltest;password=test;port=3306;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=true",
44
"SocketPath": "./../../../../.ci/run/mysql/mysqld.sock",
55
"PasswordlessUser": "no_password",
66
"SecondaryDatabase": "testdb2",

‎.ci/config/config.uds.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"Data": {
3-
"ConnectionString": "server=./../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600",
3+
"ConnectionString": "server=./../../../../.ci/run/mysql/mysqld.sock;user id=mysqltest;password=test;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600",
44
"PasswordlessUser": "no_password",
55
"SecondaryDatabase": "testdb2",
66
"UnsupportedFeatures": "None",

‎.ci/integration-tests-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ steps:
2525
- template: 'conformance-test-steps.yml'
2626
parameters:
2727
image: ${{ parameters.image }}
28-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
28+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=disabled;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
2929
- template: 'integration-test-steps.yml'
3030
parameters:
3131
image: ${{ parameters.image }}
@@ -37,14 +37,14 @@ steps:
3737
parameters:
3838
image: ${{ parameters.image }}
3939
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
40-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
40+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=disabled;UseCompression=True;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
4141
platform: 'net8.0'
4242
description: 'Compression'
4343
- template: 'integration-test-steps.yml'
4444
parameters:
4545
image: ${{ parameters.image }}
4646
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
47-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
47+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
4848
platform: 'net10.0'
4949
description: 'No SSL'
5050
- template: 'integration-test-steps.yml'

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
1818
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
1919
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
20-
<PackageVersion Include="MySql.Data" Version="9.4.0" />
20+
<PackageVersion Include="MySql.Data" Version="9.5.0" />
2121
<PackageVersion Include="NLog" Version="4.7.15" />
2222
<PackageVersion Include="Serilog" Version="2.12.0" />
2323
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />

‎azure-pipelines.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
testRunTitle: 'MySql.Data integration tests'
5353
env:
5454
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,ParsecAuthentication,StreamingResults,TlsFingerprintValidation,UnixDomainSocket,Vector'
55-
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=root;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
55+
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=root;password=test;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600'
5656
DATA__CERTIFICATESPATH: '$(Build.Repository.LocalPath)\.ci\server\certs\'
5757
DATA__MYSQLBULKLOADERLOCALCSVFILE: '$(Build.Repository.LocalPath)\tests\TestData\LoadData_UTF8_BOM_Unix.CSV'
5858
DATA__MYSQLBULKLOADERLOCALTSVFILE: '$(Build.Repository.LocalPath)\tests\TestData\LoadData_UTF8_BOM_Unix.TSV'
@@ -84,7 +84,7 @@ jobs:
8484
- template: '.ci/conformance-test-steps.yml'
8585
parameters:
8686
image: 'mysql:8.0'
87-
connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
87+
connectionString: 'server=localhost;port=3306;user id=mysqltest;password=test;database=conformance;ssl mode=disabled;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
8888

8989
- job: windows_integration_tests_1
9090
displayName: 'Windows Integration Tests (Part 1)'
@@ -121,7 +121,7 @@ jobs:
121121
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net481/net10.0', 'No SSL') }}
122122
env:
123123
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,ParsecAuthentication,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket,Vector'
124-
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
124+
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True;UseCompression=True'
125125

126126
- job: windows_integration_tests_2
127127
displayName: 'Windows Integration Tests (Part 2)'
@@ -159,7 +159,7 @@ jobs:
159159
testRunTitle: ${{ format('{0}, $(Agent.OS), {1}, {2}', 'mysql:8.0', 'net8.0', 'No SSL') }}
160160
env:
161161
DATA__UNSUPPORTEDFEATURES: 'Ed25519,QueryAttributes,ParsecAuthentication,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,UnixDomainSocket,Vector'
162-
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
162+
DATA__CONNECTIONSTRING: 'server=localhost;port=3306;user id=mysqltest;password=test;database=mysqltest;ssl mode=disabled;DefaultCommandTimeout=3600;AllowPublicKeyRetrieval=True'
163163

164164
- job: linux_integration_tests
165165
dependsOn: linux_build
@@ -180,6 +180,10 @@ jobs:
180180
image: 'mysql:9.4'
181181
connectionStringExtra: 'AllowPublicKeyRetrieval=True'
182182
unsupportedFeatures: 'Ed25519,ParsecAuthentication,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,Vector,ZeroDateTime'
183+
'MySQL 9.5':
184+
image: 'mysql:9.5'
185+
connectionStringExtra: 'AllowPublicKeyRetrieval=True'
186+
unsupportedFeatures: 'Ed25519,ParsecAuthentication,Redirection,StreamingResults,Tls11,TlsFingerprintValidation,Vector,ZeroDateTime'
183187
'MariaDB 10.6':
184188
image: 'mariadb:10.6'
185189
connectionStringExtra: ''

‎docs/content/connection-options.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ These are the options that need to be used in order to configure a connection to
128128
<td>This option has the following values:
129129
<ul>
130130
<li><b>Preferred</b> - (this is the default). Use SSL if the server supports it.</li>
131-
<li><b>None</b> - Do not use SSL.</li>
131+
<li><b>Disabled</b> (or <b>None</b>) - Do not use SSL.</li>
132132
<li><b>Required</b> - Always use SSL. Deny connection if server does not support SSL. Does not validate CA or hostname.</li>
133133
<li><b>VerifyCA</b> - Always use SSL. Validates the CA but tolerates hostname mismatch.</li>
134134
<li><b>VerifyFull</b> - Always use SSL. Validates CA and hostname.</li>

‎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 (**10.6**, **10.11**), 11.x (**11.4**, **11.8**) |
68-
MySQL | 5.5, 5.6, 5.7, 8.x (**8.0**, **8.4**), 9.x (**9.4**) | 5.5 is EOL and has some [compatibility issues](https://github.com/mysql-net/MySqlConnector/issues/1192); 5.6 and 5.7 are EOL
68+
MySQL | 5.5, 5.6, 5.7, 8.x (**8.0**, **8.4**), 9.x (**9.4**, **9.5**) | 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)
7171
ProxySQL | 2.x | Some [compatibility issues](https://github.com/search?q=repo%3Amysql-net%2FMySqlConnector+proxysql&type=issues)

‎docs/content/tutorials/migrating-from-connector-net.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ In a .NET Framework application, make the following `app.config` change to regis
4141
<!-- add name="MySQL Data Provider"
4242
invariant="MySql.Data.MySqlClient"
4343
description=".Net Framework Data Provider for MySQL"
44-
type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=9.4.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" / -->
44+
type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=9.5.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" / -->
4545

4646
<!-- ADD THIS -->
4747
<add name="MySqlConnector"

‎tests/Benchmark/Benchmark.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
99
<PackageReference Include="MySqlConnector" Version="2.4.0" />
10-
<PackageReference Include="MySql.Data" Version="9.4.0" />
10+
<PackageReference Include="MySql.Data" Version="9.5.0" />
1111
</ItemGroup>
1212

1313
<!-- <ItemGroup>-->

0 commit comments

Comments
 (0)