aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-11-10 23:10:46 +0000
committerMatthew Wild <mwild1@gmail.com>2013-11-10 23:10:46 +0000
commitc71bff87a6601ab98221fed02f8c9b2a97a45d6f (patch)
treeee4bb5e7ca57631ceb44efe91d1e839806ccc3bb
parentfd5b526846c3d031640fcd18a2bb8e421c27ea4e (diff)
parenta80e00e16f382874e7caffd60b37160fc2d81f5b (diff)
downloadprosody-c71bff87a6601ab98221fed02f8c9b2a97a45d6f.tar.gz
prosody-c71bff87a6601ab98221fed02f8c9b2a97a45d6f.zip
Merge 0.10->trunk
-rw-r--r--util/sql.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index 735fbce8..07b1a4e0 100644
--- 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 };