diff options
| author | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-11-13 11:59:43 +0100 |
| commit | d8155aef2c5323708f59d95540aafd1824eedcb9 (patch) | |
| tree | 35e7e5c860fce3eb29284d9bdeb98bd167cce04f | |
| parent | 525a4393c735f83b6471941333e4a6ab7483a640 (diff) | |
| parent | f454faa15bdbccc23b805dcb110e985cb0ff0295 (diff) | |
| download | prosody-d8155aef2c5323708f59d95540aafd1824eedcb9.tar.gz prosody-d8155aef2c5323708f59d95540aafd1824eedcb9.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/sql.lua | 2 |
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; |