bug #3995 Drizzle server charset notice
Fix merge conflicts