Software / code / prosody
Diff
util/sql.lua @ 7312:b4e99602ae75
util.sql: Charset should be innocent until proven guilty (initialize charset_ok to true), fixes bug introduced in 187ba2e9c012
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 23 Mar 2016 12:17:28 +0000 |
| parent | 7306:98c4c3a2b536 |
| child | 7317:a2dce746599b |
line wrap: on
line diff
--- a/util/sql.lua Tue Mar 22 14:42:55 2016 +0100 +++ b/util/sql.lua Wed Mar 23 12:17:28 2016 +0000 @@ -328,7 +328,7 @@ 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);
