Thanks for the advice. Potential fix posted now at https://salsa.debian.org/mariadb-team/mariadb-server/-/merge_requests/90 for team review.