aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-11-13 11:59:43 +0100
committerKim Alvefur <zash@zash.se>2013-11-13 11:59:43 +0100
commit1712a45fdc3fb3da014ad85e97eb7c7dab855e9a (patch)
tree35e7e5c860fce3eb29284d9bdeb98bd167cce04f
parentccbb44a824513de54767d9442ab9b012d81f6b1f (diff)
parent0dce82a095192a7a581511eb1455732e5a3da16c (diff)
downloadprosody-1712a45fdc3fb3da014ad85e97eb7c7dab855e9a.tar.gz
prosody-1712a45fdc3fb3da014ad85e97eb7c7dab855e9a.zip
Merge 0.10->trunk
-rw-r--r--util/sql.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index a7f46421..5a1dda5d 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -308,7 +308,7 @@ function engine:set_encoding() -- to UTF-8
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;