Skip to content

Commit

Permalink
Couple fixes caught by testing
Browse files Browse the repository at this point in the history
Signed-off-by: Petr "Stone" Hracek <[email protected]>
  • Loading branch information
phracek committed Aug 8, 2024
1 parent ecdf5e8 commit adcf054
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion 8.4/Dockerfile.c10s
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit adcf054

Please sign in to comment.