MDEV-38874: Make tests pass after 2030#4667

bmwiedemann wants to merge 1 commit intoMariaDB:11.8MariaDB/server:11.8from

bmwiedemann:ftbfs2030bmwiedemann/server:ftbfs2030Copy head branch name to clipboard