FYI, this was merged in https://salsa.debian.org/mariadb-team/mariadb-server/-/commit/3062888cb67ba22a5e0acaeb3321a06cb7d07ea3 and uploaded to Debian.
Latest build statuses: https://buildd.debian.org/status/package.php?p=mariadb Upstream seems to also do their fixes: - https://github.com/MariaDB/server/pull/2477 - https://github.com/MariaDB/server/pull/2472 What do you think is the best long-term fix?