From a30b9b93a402022bb2ef8a2e63dc26020c097518 Mon Sep 17 00:00:00 2001
From: Brian Cloutier <github@briancloutier.com>
Date: Thu, 2 Feb 2017 15:51:34 +0300
Subject: [PATCH] Set a memory context when throwing deferred errors

---
 src/backend/distributed/utils/errormessage.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/backend/distributed/utils/errormessage.c b/src/backend/distributed/utils/errormessage.c
index 2482768e7..f2b69986e 100644
--- a/src/backend/distributed/utils/errormessage.c
+++ b/src/backend/distributed/utils/errormessage.c
@@ -6,6 +6,7 @@
  */
 
 #include "postgres.h"
+#include "utils/memutils.h"
 
 #include "distributed/citus_nodes.h"
 #include "distributed/errormessage.h"
@@ -54,5 +55,7 @@ RaiseDeferredErrorInternal(DeferredErrorMessage *error, int elevel)
 	errorData->lineno = error->linenumber;
 	errorData->funcname = error->functionname;
 
+	errorData->assoc_context = ErrorContext;
+
 	ThrowErrorData(errorData);
 }