Merge @radar's MySQL test fixes