Merge upstream changes: mysql driver; make build target patch (quilt)