diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-03-23 12:19:23 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-03-23 12:19:23 +0000 |
| commit | 6ba752537d94d555b84862d99fe57d883d94f724 (patch) | |
| tree | 19bbee1ddaa22369aec0f6558391969263a27aa2 /util/sql.lua | |
| parent | 576a049e5671ace54176515868e495dfbc5482d3 (diff) | |
| parent | 8005cf6813739ada38ad073f7a768d1667bdb8c5 (diff) | |
| download | prosody-6ba752537d94d555b84862d99fe57d883d94f724.tar.gz prosody-6ba752537d94d555b84862d99fe57d883d94f724.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/sql.lua')
| -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 f64e8e10..657acb79 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -328,7 +328,7 @@ function engine:set_encoding() -- to UTF-8 local ok, actual_charset = self:transaction(function () return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'"; end); - local charset_ok; + local charset_ok = true; for row in actual_charset do if row[2] ~= charset then log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset); |