[Maria-developers] MDEV-4309, second patch: review