Updated mysql Makefile and MariaDB includes