Merge "Fix MySQL log collection"