# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1463879817 -3600
# Node ID 713d6f8e84d0b83a02d3943d3e112d801f8be69a
# Parent  bf43a08e5a74fcbe92c29a24897f153e144624ef# Parent  f791651ee334a3f9a4ed6ad792095267d7ef82bc
Merge 0.10->trunk

diff -r bf43a08e5a74 -r 713d6f8e84d0 util/sql.lua
--- a/util/sql.lua	Sun May 15 16:55:19 2016 +0200
+++ b/util/sql.lua	Sun May 22 02:16:57 2016 +0100
@@ -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");