Skip to content

Make fully compatible with MariaDB 10.4/11.6 and MySQL 8.0/8.4 #1329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2025
Merged

Make fully compatible with MariaDB 10.4/11.6 and MySQL 8.0/8.4 #1329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compose/compose.healthcheck.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:

db:
healthcheck:
test: "mysqladmin ping -h localhost -u root -pmagento"
test: "mysqladmin ping -h localhost -u root -pmagento || mariadb-admin ping -h localhost -u root -pmagento"
interval: 5s
timeout: 5s
retries: 30
Expand Down
2 changes: 2 additions & 0 deletions compose/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ services:
--max_allowed_packet=64M
--optimizer_use_condition_selectivity=1
--optimizer_switch="rowid_filter=off"
--log_bin_trust_function_creators=1
ports:
- "3306:3306"
env_file: env/db.env
Expand All @@ -53,6 +54,7 @@ services:
# image: mysql:8.4
# command:
# --max_allowed_packet=64M
# --log_bin_trust_function_creators=1
# ports:
# - "3306:3306"
# env_file: env/db.env
Expand Down