From acdac0b8edc1c3073e0505ed65c4f90add4317c6 Mon Sep 17 00:00:00 2001
From: "Stephen R. van den Berg" <srb@cuci.nl>
Date: Tue, 1 May 2018 02:59:35 +0200
Subject: [PATCH] pgsql: Drain portal queue to completion.
---
lib/modules/Sql.pmod/pgsql_util.pmod | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/modules/Sql.pmod/pgsql_util.pmod b/lib/modules/Sql.pmod/pgsql_util.pmod
index 048f9e7e86..ae84c2b826 100644
--- a/lib/modules/Sql.pmod/pgsql_util.pmod
+++ b/lib/modules/Sql.pmod/pgsql_util.pmod
@@ -2444,8 +2444,8 @@ class proxy {
throwdelayederror(this);
{
Thread.MutexKey lock;
- if (qportals && qportals->size())
- catch(cancelquery());
+ while (qportals && qportals->size())
+ sleep(0.1, 1); // Drain portal queue to completion
if (unnamedstatement)
termlock = unnamedstatement->lock(1);
if (c) // Prevent trivial backtraces
--
GitLab