# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1510043344 -3600
# Node ID 2a0915aa61314ee92b5107e9478243228094a31e
# Parent  58cdbbe3b86aa50f1afb228c811f25e1753cb600# Parent  6a098961bc008a3eeb60518789d41606a7dc3f15
Merge 0.10->trunk

diff -r 58cdbbe3b86a -r 2a0915aa6131 util/sql.lua
--- a/util/sql.lua	Tue Nov 07 02:32:45 2017 +0100
+++ b/util/sql.lua	Tue Nov 07 09:29:04 2017 +0100
@@ -236,7 +236,8 @@
 	if success then
 		log("debug", "SQL transaction success [%s]", tostring(func));
 		local ok, err = self.conn:commit();
-		if not ok then return ok, err; end -- commit failed
+		-- LuaDBI doesn't actually return an error message here, just a boolean
+		if not ok then return ok, err or "commit failed"; end
 		return success, a, b, c;
 	else
 		log("debug", "SQL transaction failure [%s]: %s", tostring(func), a.err);