From: Matthew Wild <mwild1@gmail.com>
Date: Sun, 22 May 2016 01:16:57 +0000 (+0100)
Subject: Merge 0.10->trunk
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=ba884557ec95b3720a68b962756e289b82bf15c5;hp=74c88eed6701d02bf77a59aeedb8d8204c41bc17;p=prosody.git

Merge 0.10->trunk
---

diff --git a/util/sql.lua b/util/sql.lua
index acdf9c63..843e7dda 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -2,7 +2,7 @@
 local setmetatable, getmetatable = setmetatable, getmetatable;
 local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113
 local tonumber, tostring = tonumber, tostring;
-local assert, xpcall, debug_traceback = assert, xpcall, debug.traceback;
+local assert, pcall, xpcall, debug_traceback = assert, pcall, xpcall, debug.traceback;
 local t_concat = table.concat;
 local s_char = string.char;
 local log = require "util.logger".init("sql");