Merge 0.10->trunk

[prosody.git] / util / sql.lua

diff --git a/util/sql.lua b/util/sql.lua
index 735fbce825d688d596e2d2bd20ce44c4ee936441..07b1a4e0926039e9f8b330b680e36f7555f018a8 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -313,7 +313,7 @@ function engine:set_encoding() -- to UTF-8
                charset = row and row[1] or charset;
        end
        self.charset = charset;
-       return self:transaction(function() return engine:execute(set_names_query:format(charset)); end);
+       return self:transaction(function() return self:execute(set_names_query:format(charset)); end);
 end
 local engine_mt = { __index = engine };