diff util/sql.lua @ 6775:22c8deb43daf

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Tue, 11 Aug 2015 10:29:25 +0200
parents 60957dd5b41b
children 5de6b93d0190
line wrap: on
line diff
--- a/util/sql.lua	Mon Jul 27 09:38:40 2015 +0100
+++ b/util/sql.lua	Tue Aug 11 10:29:25 2015 +0200
@@ -285,7 +285,7 @@
 	if not ok then
 		return ok, err;
 	end
-	
+
 	if driver == "MySQL" then
 		local ok, actual_charset = self:transaction(function ()
 			return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
@@ -297,7 +297,7 @@
 			end
 		end
 	end
-	
+
 	return true;
 end
 local engine_mt = { __index = engine };