Software / code / prosody
Diff
util/sql.lua @ 5920:0e5a38ba4c15
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 13 Nov 2013 11:59:43 +0100 |
| parent | 5919:d1cc67ed0767 |
| child | 6532:a966efeb6cb3 |
line wrap: on
line diff
--- 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;
