From adcf05469a38b934ecb8a9dbf239f414026ebac8 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Thu, 8 Aug 2024 09:32:51 +0200 Subject: [PATCH] Couple fixes caught by testing Signed-off-by: Petr "Stone" Hracek --- 8.4/Dockerfile.c10s | 2 +- .../share/container-scripts/mysql/init/40-datadir-action.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/8.4/Dockerfile.c10s b/8.4/Dockerfile.c10s index 39f10c3d..777717d9 100644 --- a/8.4/Dockerfile.c10s +++ b/8.4/Dockerfile.c10s @@ -16,7 +16,7 @@ ENV MYSQL_VERSION=8.4 \ HOME=/var/lib/mysql \ NAME=mysql -ENV SUMMARY="MySQL 8.0 SQL database server" \ +ENV SUMMARY="MySQL 8.4 SQL database server" \ DESCRIPTION="MySQL is a multi-user, multi-threaded SQL database server. The container \ image provides a containerized packaging of the MySQL mysqld daemon and client application. \ The mysqld server daemon accepts connections from clients and provides access to content from \ diff --git a/root-common/usr/share/container-scripts/mysql/init/40-datadir-action.sh b/root-common/usr/share/container-scripts/mysql/init/40-datadir-action.sh index 45a583d1..52d17c1e 100644 --- a/root-common/usr/share/container-scripts/mysql/init/40-datadir-action.sh +++ b/root-common/usr/share/container-scripts/mysql/init/40-datadir-action.sh @@ -7,6 +7,7 @@ upstream_upgrade_info() { 5.6) echo "https://dev.mysql.com/doc/refman/5.6/en/upgrading-from-previous-series.html" ;; 5.7) echo "https://dev.mysql.com/doc/refman/5.7/en/upgrading-from-previous-series.html" ;; 8.0) echo "https://dev.mysql.com/doc/refman/8.0/en/upgrading-from-previous-series.html" ;; + 8.4) echo "https://dev.mysql.com/doc/refman/8.4/en/upgrading-from-previous-series.html" ;; *) echo "Non expected version '${MYSQL_VERSION}'" ; return 1 ;; esac } @@ -58,7 +59,7 @@ check_datadir_version() { fi if [ $(( ${datadir_version} + 1 )) -eq "${mysqld_version}" -o "${datadir_version}" -eq 505 -a "${mysqld_version}" -eq 1000 \ - -o "${datadir_version}" -eq 507 -a "${mysqld_version}" -eq 800 ]; then + -o "${datadir_version}" -eq 507 -a "${mysqld_version}" -eq 800 -o "${datadir_version}" -eq 800 -a "${mysqld_version}" -eq 804 ]; then log_warn "MySQL server is version ${mysqld_version_dot} and datadir is version"\ "${datadir_version_dot}, which is a compatible combination." if [ "${MYSQL_DATADIR_ACTION}" == 'upgrade-auto' ] ; then