util.sql: Get character set info from the correct database.
util.sql: Fix previous commit
Merge 0.10->trunk