Merge pull request #5812 from micmac1/mysql-fix