Fixing the build with changes to MySQL