A follow up fix for MDEV-5528
(forgot to do "git add" for two files in the previous commit for MDEV-5528)