[MariaDB developers] MDEV-29744 fix required when merging to 11.4