Merge pull request #31454 from gavindsouza/mariadb-client-refactor

fix: Misc enhancements