Software / code / prosody
Diff
util/sql.lua @ 5911:7051dc27e531
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 10 Nov 2013 23:10:46 +0000 |
| parent | 5910:a19b3646d5f0 |
| child | 5912:f6145e894569 |
line wrap: on
line diff
--- a/util/sql.lua Sun Nov 10 18:50:01 2013 +0000 +++ b/util/sql.lua Sun Nov 10 23:10:46 2013 +0000 @@ -313,7 +313,7 @@ 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 };
