Skip to content

Commit b8dccf9

Browse files
committed
Stop using deprecated mysql_native_password plugin. Fixes #1345
1 parent fcb2d1b commit b8dccf9

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.ci/docker-run.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ OMIT_FEATURES=$3
2525
MYSQL_EXTRA=
2626
MYSQL=mysql
2727

28-
if [[ "$IMAGE" == mysql:8.0 || "$IMAGE" == mysql:8.3 ]]; then
29-
MYSQL_EXTRA='--default-authentication-plugin=mysql_native_password'
30-
fi
3128
if [[ "$IMAGE" == mariadb* ]]; then
3229
MYSQL_EXTRA='--in-predicate-conversion-threshold=100000'
3330
fi

.ci/integration-tests-steps.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ steps:
2020
- template: 'conformance-test-steps.yml'
2121
parameters:
2222
image: ${{ parameters.image }}
23-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600'
23+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=conformance;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
2424
- template: 'integration-test-steps.yml'
2525
parameters:
2626
image: ${{ parameters.image }}
@@ -32,14 +32,14 @@ steps:
3232
parameters:
3333
image: ${{ parameters.image }}
3434
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
35-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600'
35+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;UseCompression=True;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
3636
platform: 'net6.0'
3737
description: 'Compression'
3838
- template: 'integration-test-steps.yml'
3939
parameters:
4040
image: ${{ parameters.image }}
4141
unsupportedFeatures: ${{ parameters.unsupportedFeatures }}
42-
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600'
42+
connectionString: 'server=localhost;port=3300;user id=mysqltest;password=test;database=mysqltest;ssl mode=none;DefaultCommandTimeout=3600;${{ parameters.connectionStringExtra }}'
4343
platform: 'net6.0'
4444
description: 'No SSL'
4545
- template: 'integration-test-steps.yml'

azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ jobs:
231231
unsupportedFeatures: 'CachingSha2Password,Ed25519,QueryAttributes,Tls11,Tls13,UuidToBin'
232232
'MySQL 8.0':
233233
image: 'mysql:8.0'
234-
connectionStringExtra: ''
234+
connectionStringExtra: 'AllowPublicKeyRetrieval=True'
235235
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
236236
'MySQL 8.3':
237237
image: 'mysql:8.3'
238-
connectionStringExtra: ''
238+
connectionStringExtra: 'AllowPublicKeyRetrieval=True'
239239
unsupportedFeatures: 'Ed25519,StreamingResults,Tls11,ZeroDateTime'
240240
'MariaDB 10.6':
241241
image: 'mariadb:10.6'

0 commit comments

Comments
 (0)