# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1384125046 0
# Node ID 7051dc27e531dfb6e0a38d978bbc99a10a95f260
# Parent  d6b3891f186cb8e4adc52d62d76ac7996f0b8c4c# Parent  a19b3646d5f0c4134668968adf06aedfcfbdc371
Merge 0.10->trunk

diff -r d6b3891f186c -r 7051dc27e531 util/sql.lua
--- 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 };