From 3d42d524c1b5221c6b03c90e3d7cdf6d6df8b3d1 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Wed, 14 May 2025 17:07:55 +0200 Subject: [PATCH 1/3] changed mysql image in CI from mysql 8.3 to LTS mysql 8.4 --- .circleci/config.yml | 2 +- .github/workflows/nightly.yml | 8 ++++---- .github/workflows/push.yml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0ce68b36d9013..8ab588aa2e40b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: resource_class: arm.medium docker: - image: cimg/base:current-22.04 - - image: mysql:8.3 + - image: mysql:8.4 environment: MYSQL_ALLOW_EMPTY_PASSWORD: true MYSQL_ROOT_PASSWORD: '' diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1b1532af7f799..fee12de8300ea 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -137,7 +137,7 @@ jobs: LINUX_X64: services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: @@ -281,7 +281,7 @@ jobs: PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: @@ -419,7 +419,7 @@ jobs: if: inputs.branch == 'master' services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: @@ -666,7 +666,7 @@ jobs: OPCACHE_VARIATION: services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2f82179b90ec6..e1e6c3093c02f 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -44,7 +44,7 @@ jobs: if: github.repository == 'php/php-src' || github.event_name == 'pull_request' services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: @@ -150,7 +150,7 @@ jobs: PDO_FIREBIRD_TEST_DSN: firebird:dbname=firebird:test.fdb services: mysql: - image: mysql:8.3 + image: mysql:8.4 ports: - 3306:3306 env: From eccfaa20cdc78ffa2cb2a96c8c71300751e6b759 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Sun, 25 May 2025 23:04:42 +0200 Subject: [PATCH 2/3] test: changed default auth protocol to caching_sha2_password --- ext/mysqlnd/mysqlnd_enum_n_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 851174032c404..282087250a5b9 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -34,7 +34,7 @@ #define MYSQLND_ASSEMBLED_PACKET_MAX_SIZE 3UL*1024UL*1024UL*1024UL -#define MYSQLND_DEFAULT_AUTH_PROTOCOL "mysql_native_password" +#define MYSQLND_DEFAULT_AUTH_PROTOCOL "caching_sha2_password" #define MYSQLND_ERRMSG_SIZE 512 #define MYSQLND_SQLSTATE_LENGTH 5 From 1fe465f2147ab9e7e350b0bd134f919b37b29337 Mon Sep 17 00:00:00 2001 From: Jorg Sowa Date: Mon, 26 May 2025 00:16:30 +0200 Subject: [PATCH 3/3] Revert "test: changed default auth protocol to caching_sha2_password" This reverts commit eccfaa20cdc78ffa2cb2a96c8c71300751e6b759. --- ext/mysqlnd/mysqlnd_enum_n_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 282087250a5b9..851174032c404 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -34,7 +34,7 @@ #define MYSQLND_ASSEMBLED_PACKET_MAX_SIZE 3UL*1024UL*1024UL*1024UL -#define MYSQLND_DEFAULT_AUTH_PROTOCOL "caching_sha2_password" +#define MYSQLND_DEFAULT_AUTH_PROTOCOL "mysql_native_password" #define MYSQLND_ERRMSG_SIZE 512 #define MYSQLND_SQLSTATE_LENGTH 5