Merge "Fix mysqladmin failure for Fedora 34 and mariadb"