# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1459000479 -3600
# Node ID 1fa6052f3a0703b1390b4db51af5bafe9c26da56
# Parent  62d5335353344dbf98f7aa74212d6ede5b9b3183# Parent  a2dce746599bb6c81870543da2b4e71caaa022ca
Merge 0.10->trunk

diff -r 62d533535334 -r 1fa6052f3a07 util/sql.lua
--- a/util/sql.lua	Thu Mar 24 13:57:58 2016 +0100
+++ b/util/sql.lua	Sat Mar 26 14:54:39 2016 +0100
@@ -202,6 +202,10 @@
 		engine.update = engine.execute_update;
 	end
 end
+local function handleerr(err)
+	log("error", "Error in SQL transaction: %s", debug_traceback(err, 3));
+	return err;
+end
 function engine:_transaction(func, ...)
 	if not self.conn then
 		local ok, err = self:connect();
@@ -212,7 +216,7 @@
 	local function f() return func(unpack(args, 1, n_args)); end
 	log("debug", "SQL transaction begin [%s]", tostring(func));
 	self.__transaction = true;
-	local success, a, b, c = xpcall(f, debug_traceback);
+	local success, a, b, c = xpcall(f, handleerr);
 	self.__transaction = nil;
 	if success then
 		log("debug", "SQL transaction success [%s]", tostring(func));