Bottom most line changed in this two files to resolve the mysql version
errors