diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-11-10 23:10:46 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-11-10 23:10:46 +0000 |
| commit | 2109d4abf0a687b620a3c21bfb1930bb291fa249 (patch) | |
| tree | ee4bb5e7ca57631ceb44efe91d1e839806ccc3bb | |
| parent | ea8974d055f7f015cb01ce7a43bc381455135439 (diff) | |
| parent | 12cea7620002a3bdafcebcc321dff9cb13d0ca13 (diff) | |
| download | prosody-2109d4abf0a687b620a3c21bfb1930bb291fa249.tar.gz prosody-2109d4abf0a687b620a3c21bfb1930bb291fa249.zip | |
Merge 0.10->trunk
| -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 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 }; |