Updating: tidying up contrib/mysql.