Removed default assumption in setting CHARACTER_SET, now returning
error if unrecognized char-set.
Authored by: dwarren 2014-06-12
Parent: [r7974]
Child: [r7976]