Fix MySQL build issues

I was unable to get a complete build without these changes. Not sure if this related to updates to libmysqlclient. I'm using version 5.6.15.