diff options
| author | Kim Alvefur <zash@zash.se> | 2015-08-11 10:29:25 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-08-11 10:29:25 +0200 |
| commit | af5dd482f0ece847376d7d4411806b85f48e996d (patch) | |
| tree | 02d74684d9b149679340af6d76c462c2a1d4a0b3 /util/sql.lua | |
| parent | 1338b18fb4cd898fadce44250a4cc04b0f27aca4 (diff) | |
| parent | b49513cdeb2bb123625fb87f53a04d42b7eb6fb2 (diff) | |
| download | prosody-af5dd482f0ece847376d7d4411806b85f48e996d.tar.gz prosody-af5dd482f0ece847376d7d4411806b85f48e996d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/sql.lua')
| -rw-r--r-- | util/sql.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util/sql.lua b/util/sql.lua index f934bbdf..be34c381 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -285,7 +285,7 @@ function engine:set_encoding() -- to UTF-8 if not ok then return ok, err; end - + if driver == "MySQL" then local ok, actual_charset = self:transaction(function () return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'"; @@ -297,7 +297,7 @@ function engine:set_encoding() -- to UTF-8 end end end - + return true; end local engine_mt = { __index = engine }; |