# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1384340383 -3600
# Node ID 0e5a38ba4c15b63256ca9cd479e615dc36b61380
# Parent  99bf636fce466210e7a5d0dfa1dc28c46854c1c4# Parent  d1cc67ed076737382f95354ca4aee5168f496738
Merge 0.10->trunk

diff -r 99bf636fce46 -r 0e5a38ba4c15 util/sql.lua
--- a/util/sql.lua	Tue Nov 12 02:23:29 2013 +0000
+++ b/util/sql.lua	Wed Nov 13 11:59:43 2013 +0100
@@ -308,7 +308,7 @@
 	if driver == "MySQL" then
 		set_names_query = set_names_query:gsub(";$", " COLLATE 'utf8_bin';");
 		local ok, charsets = self:transaction(function()
-			return self:select"SELECT `CHARACTER_SET_NAME` FROM `CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;";
+			return self:select"SELECT `CHARACTER_SET_NAME` FROM `information_schema`.`CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;";
 		end);
 		local row = ok and charsets();
 		charset = row and row[1] or charset;