From 16990c8e03e26975d98f519c49d8233673d6864d Mon Sep 17 00:00:00 2001
From: David Hall <david.hall@mariadb.com>
Date: Tue, 24 Oct 2017 13:36:50 -0500
Subject: [PATCH] MCOL-985 Add return code test after call to
 buildReturnedColumn

---
 dbcon/mysql/ha_calpont_execplan.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp
index 1c9bd7c99..e6ec41500 100755
--- a/dbcon/mysql/ha_calpont_execplan.cpp
+++ b/dbcon/mysql/ha_calpont_execplan.cpp
@@ -3552,6 +3552,10 @@ ReturnedColumn* buildAggregateColumn(Item* item, gp_walk_info& gwi)
 				else
 				{
 					rc = buildReturnedColumn(ord_col, gwi, gwi.fatalParseError);
+					if (!rc || gwi.fatalParseError)
+					{
+						return NULL;
+					}
 				}
 			rc->asc((*order_item)->asc);
 			orderCols.push_back(SRCP(rc));