Merge "With mysqli, avoid setting the charset twice"