This commit is a squash of two commits from Fedora, version 3.0.0 (Alpha)
and 3.0.1 (Beta). Links:
16f85de242ed122496b4
This change is API and ABI incompatible with the previous version 2.7.*, but it is needed for future updates
of mariadb in rhel-9
Resolves: #1995101